##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r12156:4c94b6d0 default
r12278:c4c2ba55 merge default
Show More
test-update-reverse.out
58 lines | 1.3 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
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:91ebc10ed028
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 summary: Added side2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:b932d7dbb1e1
parent: 0:c2eda428b523
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 summary: Added side1
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:71a760306caf
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 summary: Added main
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:c2eda428b523
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 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
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:91ebc10ed028
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 summary: Added side2
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:71a760306caf
mpm@selenic.com
Fix bug with co -C across branches, update tests
r1236 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 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
Martin Geisler
tests: remove unneeded -d flags...
r12156 ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf
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