##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

run-tests: give each child its own tmp dir (issue1911)...
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Matt Mackall - - Load All Authors

File last commit:

r8753:af5f099d default
r9899:be574a37 stable
Show More
test-update-reverse.out
55 lines | 1.2 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
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 removing side1
removing side2
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