upstream/mercurial-mirror Files · tests/test-confused-revert.out

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.

Brendan Cully - - Load All Authors

File last commit:

r3095:25857e00 default


                r6297:fed1a9c2

default

Download file

             test-confused-revert.out
        
                    27 lines
            
             | 694 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-confused-revert.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show a removed and b added
		A b
		R a
		reverting...
Vadim Gelfer small changes to revert command....	r2042	undeleting a
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	forgetting b
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show b unknown and a back to normal
		? b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	merging a
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show foo-b
		foo-b
		%%% should show a removed and b added
		A b
		R a
Vadim Gelfer make test-confused-revert check working dir with two parents.	r2214	%%% revert should fail
Brendan Cully cat: default to working dir parent instead of tip...	r3095	abort: uncommitted merge - please provide a specific revision
Vadim Gelfer make test-confused-revert check working dir with two parents.	r2214	%%% revert should be ok now
Vadim Gelfer small changes to revert command....	r2042	undeleting a
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	forgetting b
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show b unknown and a marked modified (merged)
		? b
		%%% should show foo-b
		foo-b

	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