##// END OF EJS Templates
merge: simplify local created logic
merge: simplify local created logic

File last commit:

r3110:40e777bd default
r3120:1c1e59aa default
Show More
test-update-reverse.out
54 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-update-reverse.out
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
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: remove linear variable
r3110 overwrite True branchmerge False partial False
Matt Mackall
merge: use context code to retrieve manifests
r2979 ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 remote deleted side2, clobbering
remote deleted side1, clobbering
remote created main
getting main
removing side1
removing side2
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