##// 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:

r7815:bcd364b2 default
r9899:be574a37 stable
Show More
test-convert-hg-startrev.out
88 lines | 1.9 KiB | text/plain | TextLexer
/ tests / test-convert-hg-startrev.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
convert: implement startrev for hg source
 r6885 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
merging a and e to e
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% convert from null revision
initializing destination empty repository
scanning source...
sorting...
converting...
% convert from zero revision
initializing destination full repository
scanning source...
sorting...
converting...
5 0: add a b
4 1: add c
3 2: copy e from a, change b
2 3: change a
1 4: merge 2 and 3, copy d from b
0 5: change a
o 5 "5: change a" files: a
|
o 4 "4: merge 2 and 3, copy d from b" files: d e
|\
| o 3 "3: change a" files: a
| |
o | 2 "2: copy e from a, change b" files: b e
| |
o | 1 "1: add c" files: c
|/
o 0 "0: add a b" files: a b
% convert from merge parent
initializing destination conv1 repository
scanning source...
sorting...
converting...
3 1: add c
2 2: copy e from a, change b
1 4: merge 2 and 3, copy d from b
0 5: change a
o 3 "5: change a" files: a
|
o 2 "4: merge 2 and 3, copy d from b" files: a d e
|
o 1 "2: copy e from a, change b" files: b e
|
o 0 "1: add c" files: a b c
% check copy preservation
Matt Mackall
convert: change hg.saverev default to False...
 r7815 changeset: 2:d67b1d48a835
Patrick Mezard
convert: implement startrev for hg source
 r6885 user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: 4: merge 2 and 3, copy d from b
Matt Mackall
convert: change hg.saverev default to False...
 r7815 changeset: 1:462c431cf47d
Patrick Mezard
convert: implement startrev for hg source
 r6885 user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: 2: copy e from a, change b
% check copy removal on missing parent
Matt Mackall
convert: change hg.saverev default to False...
 r7815 changeset: 2:d67b1d48a835
Patrick Mezard
convert: implement startrev for hg source
 r6885 user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: 4: merge 2 and 3, copy d from b
a
a
a
b
b
% convert from merge
initializing destination conv4 repository
scanning source...
sorting...
converting...
1 4: merge 2 and 3, copy d from b
0 5: change a
o 1 "5: change a" files: a
|
o 0 "4: merge 2 and 3, copy d from b" files: a b c d e
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
a
b
b