upstream/mercurial-mirror Files · tests/test-tags.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-tags.out
        
                    32 lines
            
             | 1.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-tags.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com Add a tags/identify test group...	r345	unknown
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	0acdaf898367 tip
		0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
		tip 1:8a3ca90d111dc784e6575d373105be12570e8776
		first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
		8a3ca90d111d tip
mpm@selenic.com Update test output for status change...	r748	M a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	8a3ca90d111d+ tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	0acdaf898367+ first
		0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first
mpm@selenic.com Update test output for status change...	r748	M a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	8216907a933d tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	8216907a933d+8a3ca90d111d+ tip
mpm@selenic.com Clean up some merge logic...	r993	M .hgtags
Benoit Boissinot add checking for invalid entries in tag files...	r1986	.hgtags:2: ignoring invalid tag
		.hgtags:4: ignoring invalid tag
		localtags:1: ignoring invalid tag
		tip 4:fd868a874787a7b5af31e1675666ce691c803035
		first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
		changeset: 4:fd868a874787
		.hgtags:2: ignoring invalid tag
		.hgtags:4: ignoring invalid tag
		localtags:1: ignoring invalid tag
		tag: tip
		user: test
		date: Mon Jan 12 13:46:40 1970 +0000
		summary: tags

	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