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

Make hg update more verbose by default (issue12)...

Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default


                r2175:b2ae81a7

default

Download file

             test-confused-revert.out
        
                    25 lines
            
             | 594 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
		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 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