upstream/mercurial-mirror Files · tests/test-update-reverse.out

test-merge5: removed unnecessary parts of test...

test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments

timeless - - Load All Authors

File last commit:

r11716:db426935 stable


                r12155:94ad12aa

default

Download file

             test-update-reverse.out
        
                    58 lines
            
             | 1.3 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-update-reverse.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	Main should be gone
		a
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 3:ded32b0db104
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	tag: tip
		user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	summary: Added side2

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 2:92a816cea698
		parent: 0:537353581d3d
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	summary: Added side1

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:221226fb2bd8
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	summary: Added main

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 0:537353581d3d
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	summary: Added a

		Should have two heads, side2 and main
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 3:ded32b0db104
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	tag: tip
		user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	summary: Added side2

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:221226fb2bd8
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	summary: Added main

		Should show a side1 side2
		a
		side1
		side2
		resolving manifests
Matt Mackall merge: various tidying...	r3314	overwrite True partial False
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8
Matt Mackall merge: pretend ancestor is local to simplify backwards and overwrite	r8734	side2: other deleted -> r
		side1: other deleted -> r
Matt Mackall merge: simplify actions with helper function	r3121	main: remote created -> g
timeless progress: use gerund (updating) for merge progress	r11716	updating: side1 1/3 files (33.33%)
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	removing side1
timeless progress: use gerund (updating) for merge progress	r11716	updating: side2 2/3 files (66.67%)
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	removing side2
timeless progress: use gerund (updating) for merge progress	r11716	updating: main 3/3 files (100.00%)
Paul Moore Sort removes first when applying updates (fixes issues 750 and 912)...	r6805	getting main
Benoit Boissinot ui: output the number of file updated/merged/removed/... on update...	r1922	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	Should only show a main
		a
		main

	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