upstream/mercurial-mirror Files · \ · RhodeCode Free Hosting

dirstate.remove: during merges, remember the previous file state...

dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.

Alexis S. L. Carvalho -


            r6297:fed1a9c2

default

Name	Size	Modified	Last Commit	Author

contrib
doc
hgext
mercurial
templates
tests
.hgignore	Loading ...
.hgsigs	Loading ...
.hgtags	Loading ...
CONTRIBUTORS	Loading ...
COPYING	Loading ...
Makefile	Loading ...
README	Loading ...
hg	Loading ...
hgeditor	Loading ...
hgweb.cgi	Loading ...
hgwebdir.cgi	Loading ...
setup.py	Loading ...

README

Basic install:

$ make # see install targets
$ make install # do a system-wide install
$ hg debuginstall # sanity-check setup
$ hg # see help

See http://www.selenic.com/mercurial/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages