Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8665a748
Commit
8665a748
authored
Dec 08, 2014
by
Eric S. Raymond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
maintaining.texi: Suopport fo Arch has been moved to obolte.
Remove references that imply otherwise.
parent
d81562f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
14 deletions
+11
-14
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+5
-0
doc/emacs/maintaining.texi
doc/emacs/maintaining.texi
+6
-14
No files found.
doc/emacs/ChangeLog
View file @
8665a748
2014-12-08 Eric S. Raymond <esr@snark.thyrsus.com>
* maintaining.texi: Suopport fo Arch has been moved to obolte,
remove references that imply otherwise.
2014-11-29 Paul Eggert <eggert@cs.ucla.edu>
Lessen focus on ChangeLog files, as opposed to change log entries.
...
...
doc/emacs/maintaining.texi
View file @
8665a748
...
...
@@ -31,11 +31,11 @@ versions of a source file, storing information such as the creation
time
of
each
version
,
who
made
it
,
and
a
description
of
what
was
changed
.
The
Emacs
version
control
interface
is
called
@
dfn
{
VC
}@.
VC
commands
work
with
several
different
version
control
systems
;
currently
,
it
supports
GNU
Arch
,
Bazaar
,
CVS
,
Git
,
Mercurial
,
Monotone
,
RCS
,
The
Emacs
version
control
interface
is
called
@
dfn
{
VC
}@.
VC
commands
work
with
several
different
version
control
systems
;
currently
,
it
supports
Bazaar
,
CVS
,
Git
,
Mercurial
,
Monotone
,
RCS
,
SCCS
/
CSSC
,
and
Subversion
.
Of
these
,
the
GNU
project
distributes
CVS
,
Arch
,
RCS
,
and
Bazaar
.
RCS
,
and
Bazaar
.
VC
is
enabled
automatically
whenever
you
visit
a
file
governed
by
a
version
control
system
.
To
disable
VC
entirely
,
set
the
customizable
...
...
@@ -163,14 +163,6 @@ similar to CVS but without its problems (e.g., it supports atomic
commits of filesets, and versioning of directories, symbolic links,
meta-data, renames, copies, and deletes).
@cindex GNU Arch
@cindex Arch
@item
GNU Arch is one of the earliest @dfn{decentralized} version control
systems (the other being Monotone). @xref{VCS Concepts}, for a
description of decentralized version control systems. It is no longer
under active development, and has been deprecated in favor of Bazaar.
@cindex git
@item
Git is a decentralized version control system originally invented by
...
...
@@ -280,8 +272,8 @@ number and severity of conflicts that actually occur.
SCCS
always
uses
locking
.
RCS
is
lock
-
based
by
default
but
can
be
told
to
operate
in
a
merging
style
.
CVS
and
Subversion
are
merge
-
based
by
default
but
can
be
told
to
operate
in
a
locking
mode
.
Decentralized
version
control
systems
,
such
as
G
NU
Arch
,
Git
,
a
nd
Mercurial
,
are
exclusively
merging
-
based
.
Decentralized
version
control
systems
,
such
as
G
it
and
Mercurial
,
a
re
exclusively
merging
-
based
.
VC
mode
supports
both
locking
and
merging
version
control
.
The
terms
``
commit
''
and
``
update
''
are
used
in
newer
version
control
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment