annotate tests/test-rename-merge2.t @ 24808:d05ede9d3ecc stable

test-rename-merge2: fix test failure on Windows Windows and OpenVMS use double quote for shell quoting, posix uses single quote. Since the other test lines added in 5668202cfaaf don't include the quotes, this was presumably an oversight.
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 17 Apr 2015 12:39:55 -0400
parents 5668202cfaaf
children eea3977e6fca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
2 $ mkdir -p t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
3 $ cd t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
4 $ cat <<EOF > merge
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
5 > import sys, os
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
6 > f = open(sys.argv[1], "wb")
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
7 > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
8 > f.close()
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
9 > EOF
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
10
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
11 perform a test merge with possible renaming
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
12 args:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
13 $1 = action in local branch
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
14 $2 = action in remote branch
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
15 $3 = action in working dir
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
16 $4 = expected result
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
18 $ tm()
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
19 > {
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12788
diff changeset
20 > hg init t
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
21 > cd t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
22 > echo "[merge]" >> .hg/hgrc
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
23 > echo "followcopies = 1" >> .hg/hgrc
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
24 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
25 > # base
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
26 > echo base > a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
27 > echo base > rev # used to force commits
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
28 > hg add a rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
29 > hg ci -m "base"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
30 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
31 > # remote
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
32 > echo remote > rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
33 > if [ "$2" != "" ] ; then $2 ; fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
34 > hg ci -m "remote"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
35 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
36 > # local
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
37 > hg co -q 0
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
38 > echo local > rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
39 > if [ "$1" != "" ] ; then $1 ; fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
40 > hg ci -m "local"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
41 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
42 > # working dir
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
43 > echo local > rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
44 > if [ "$3" != "" ] ; then $3 ; fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
45 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
46 > # merge
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
47 > echo "--------------"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
48 > echo "test L:$1 R:$2 W:$3 - $4"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
49 > echo "--------------"
12788
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents: 12757
diff changeset
50 > hg merge -y --debug --traceback --tool="python ../merge"
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
51 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
52 > echo "--------------"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
53 > hg status -camC -X rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
54 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
55 > hg ci -m "merge"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
56 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
57 > echo "--------------"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
58 > echo
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
59 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
60 > cd ..
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
61 > rm -r t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
62 > }
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
63 $ up() {
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
64 > cp rev $1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
65 > hg add $1 2> /dev/null
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
66 > if [ "$2" != "" ] ; then
12743
4c4aeaab2339 check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 12484
diff changeset
67 > cp rev $2
4c4aeaab2339 check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 12484
diff changeset
68 > hg add $2 2> /dev/null
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
69 > fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
70 > }
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
71 $ uc() { up $1; hg cp $1 $2; } # update + copy
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
72 $ um() { up $1; hg mv $1 $2; }
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
73 $ nc() { hg cp $1 $2; } # just copy
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
74 $ nm() { hg mv $1 $2; } # just move
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
75 $ tm "up a " "nc a b" " " "1 get local a to b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
76 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
77 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
78 test L:up a R:nc a b W: - 1 get local a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
79 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
80 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
81 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
82 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
83 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
84 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
85 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
86 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
87 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
89 preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
90 preserving rev for resolve of rev
23482
208ec8ca7c79 merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents: 23397
diff changeset
91 a: remote unchanged -> k
20945
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
92 b: remote copied from a -> m
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
93 updating: b 1/2 files (50.00%)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
94 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
95 merging a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
97 premerge successful
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
98 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
99 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
100 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
101 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
24808
d05ede9d3ecc test-rename-merge2: fix test failure on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 24727
diff changeset
103 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
104 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
106 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
107 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
108 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
109 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
110 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
111 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
112
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
113 $ tm "nc a b" "up a " " " "2 get rem change to a and b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
114 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
115 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
116 test L:nc a b R:up a W: - 2 get rem change to a and b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
117 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
118 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
119 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
120 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
121 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
122 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
123 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
124 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
125 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
126 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
127 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
128 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
129 a: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
130 getting a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
131 updating: a 1/3 files (33.33%)
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
132 b: local copied/moved from a -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
133 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
134 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
135 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
136 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
137 premerge successful
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
138 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
139 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
140 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
141 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
142 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
143 launching merge tool: python ../merge $TESTTMP/t/t/rev * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
144 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
145 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
146 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
147 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
148 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
149 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
150 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
151 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
152
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
153 $ tm "up a " "nm a b" " " "3 get local a change to b, remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
154 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
155 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
156 test L:up a R:nm a b W: - 3 get local a change to b, remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
157 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
158 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
159 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
160 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
161 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
162 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
163 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
164 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
165 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
166 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
167 preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
168 preserving rev for resolve of rev
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
169 removing a
20945
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
170 b: remote moved from a -> m
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
171 updating: b 1/2 files (50.00%)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
172 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
173 merging a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
174 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
175 premerge successful
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
176 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
177 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
178 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
179 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
181 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
182 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
183 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
184 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
185 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
186 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
187 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
188 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
189
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
190 $ tm "nm a b" "up a " " " "4 get remote change to b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
191 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
192 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
193 test L:nm a b R:up a W: - 4 get remote change to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
194 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
195 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
196 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
197 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
198 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
199 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
200 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
201 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
202 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
203 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
204 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
205 preserving rev for resolve of rev
20945
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
206 b: local copied/moved from a -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
207 updating: b 1/2 files (50.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
208 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
209 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
210 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
211 premerge successful
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
212 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
213 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
214 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
215 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
217 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
218 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
219 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
220 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
221 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
222 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
223 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
224 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
225
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
226 $ tm " " "nc a b" " " "5 get b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
227 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
228 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
229 test L: R:nc a b W: - 5 get b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
230 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
231 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
232 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
233 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
234 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
235 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
236 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
237 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
238 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
239 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
240 preserving rev for resolve of rev
18541
5ed6a375e9ca merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 18539
diff changeset
241 b: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
242 getting b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
243 updating: b 1/2 files (50.00%)
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
244 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
245 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
246 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
247 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
248 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
249 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
250 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
251 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
252 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
253 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
254 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
255 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
256 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
257
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
258 $ tm "nc a b" " " " " "6 nothing"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
259 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
260 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
261 test L:nc a b R: W: - 6 nothing
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
262 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
263 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
264 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
265 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
266 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
267 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
268 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
269 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
270 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
271 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
272 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
273 rev: versions differ -> m
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
274 updating: rev 1/1 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
275 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
276 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
278 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
279 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
281 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
282 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
283 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
284 C b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
285 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
286
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
287 $ tm " " "nm a b" " " "7 get b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
288 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
289 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
290 test L: R:nm a b W: - 7 get b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
291 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
292 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
293 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
294 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
295 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
296 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
297 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
298 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
299 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
300 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
301 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
302 a: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
303 removing a
19095
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18634
diff changeset
304 updating: a 1/3 files (33.33%)
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
305 b: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
306 getting b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
307 updating: b 2/3 files (66.67%)
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
308 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
309 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
310 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
311 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
312 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
313 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
314 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
315 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
316 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
317 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
318 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
319 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
320
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
321 $ tm "nm a b" " " " " "8 nothing"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
322 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
323 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
324 test L:nm a b R: W: - 8 nothing
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
325 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
326 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
327 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
328 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
329 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
330 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
331 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
332 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
333 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
334 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
335 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
336 rev: versions differ -> m
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
337 updating: rev 1/1 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
338 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
339 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
340 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
341 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
342 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
343 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
344 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
345 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
346 C b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
347 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
348
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
349 $ tm "um a b" "um a b" " " "9 do merge with ancestor in a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
350 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
351 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
352 test L:um a b R:um a b W: - 9 do merge with ancestor in a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
353 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
354 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
355 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
356 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
357 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
358 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
359 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
360 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
361 preserving rev for resolve of rev
23397
c7c95838be9a merge: break out "both renamed a -> b" case
Martin von Zweigbergk <martinvonz@google.com>
parents: 23396
diff changeset
362 b: both renamed from a -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
363 updating: b 1/2 files (50.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
364 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
365 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
366 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
367 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
368 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
369 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
370 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
371 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
372 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
373 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
374 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
375 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
376 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
377 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
378 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
379 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
380 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
381
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
382
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
383 m "um a c" "um x c" " " "10 do merge with no ancestor"
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
384
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
385 $ tm "nm a b" "nm a c" " " "11 get c, keep b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
386 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
387 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
388 test L:nm a b R:nm a c W: - 11 get c, keep b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
389 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
390 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
391 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
392 b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
393 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
394 c
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
395 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18362
5a4f220fbfca copies: report found copies sorted
Mads Kiilerich <mads@kiilerich.com>
parents: 18135
diff changeset
396 src: 'a' -> dst: 'b' !
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
397 src: 'a' -> dst: 'c' !
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
398 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
399 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
400 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
401 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
402 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
403 c: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
404 getting c
23524
a1a7c94def6d merge: don't report progress for dr/rd actions
Martin von Zweigbergk <martinvonz@google.com>
parents: 23482
diff changeset
405 updating: c 1/2 files (50.00%)
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
406 rev: versions differ -> m
23524
a1a7c94def6d merge: don't report progress for dr/rd actions
Martin von Zweigbergk <martinvonz@google.com>
parents: 23482
diff changeset
407 updating: rev 2/2 files (100.00%)
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
408 picked tool 'python ../merge' for rev (binary False symlink False)
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
409 merging rev
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
410 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
411 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
412 merge tool returned: 0
12757
62c8f7691bc3 merge: make 'diverging renames' diagnostic a more helpful note.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 12743
diff changeset
413 note: possible conflict - a was renamed multiple times to:
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
414 b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
415 c
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
416 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
417 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
418 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
419 M c
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
420 C b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
421 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
422
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
423 $ tm "nc a b" "up b " " " "12 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
424 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
425 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
426 test L:nc a b R:up b W: - 12 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
427 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
428 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
429 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
430 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
431 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
432 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
433 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
434 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
435 preserving rev for resolve of rev
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
436 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
437 updating: b 1/2 files (50.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
438 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
439 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
440 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
441 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
442 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
443 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
444 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
445 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
446 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
447 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
448 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
449 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
450 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
451 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
452 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
453 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
454 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
455 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
456
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
457 $ tm "up b " "nm a b" " " "13 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
458 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
459 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
460 test L:up b R:nm a b W: - 13 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
461 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
462 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
463 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
464 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
465 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
466 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
467 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
468 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
469 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
470 a: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
471 removing a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
472 updating: a 1/3 files (33.33%)
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
473 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
474 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
475 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
476 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
477 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
478 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
479 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
480 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
481 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
482 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
483 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
484 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
485 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
486 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
487 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
488 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
489 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
490 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
491 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
492
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
493 $ tm "nc a b" "up a b" " " "14 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
494 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
495 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
496 test L:nc a b R:up a b W: - 14 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
497 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
498 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
499 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
500 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
501 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
502 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
503 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
504 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
505 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
506 a: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
507 getting a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
508 updating: a 1/3 files (33.33%)
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
509 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
510 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
511 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
512 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
513 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
514 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
515 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
516 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
517 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
518 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
519 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
520 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
521 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
522 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
523 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
524 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
525 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
526 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
527 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
528 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
529
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
530 $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
531 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
532 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
533 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
534 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
535 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
536 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
537 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
538 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
539 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
540 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
541 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
542 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
543 a: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
544 removing a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
545 updating: a 1/3 files (33.33%)
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
546 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
547 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
548 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
549 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
550 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
551 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
552 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
553 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
554 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
555 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
556 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
557 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
558 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
559 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
560 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
561 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
562 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
563 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
564 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
565
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
566 $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
567 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
568 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
569 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
570 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
571 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
572 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
573 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
574 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
575 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
576 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
577 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
578 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
579 a: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
580 getting a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
581 updating: a 1/3 files (33.33%)
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
582 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
583 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
584 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
585 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
586 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
587 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
588 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
589 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
590 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
591 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
592 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
593 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
594 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
595 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
596 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
597 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
598 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
599 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
600 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
601 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
602
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
603 $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
604 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
605 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
606 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
607 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
608 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
609 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
610 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
611 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
612 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
613 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
614 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
615 preserving rev for resolve of rev
23482
208ec8ca7c79 merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents: 23397
diff changeset
616 a: remote unchanged -> k
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
617 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
618 updating: b 1/2 files (50.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
619 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
620 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
621 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
622 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
623 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
624 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
625 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
626 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
627 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
628 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
629 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
630 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
631 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
632 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
633 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
634 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
635 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
636 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
637
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
638 $ tm "nm a b" "up a b" " " "18 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
639 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
640 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
641 test L:nm a b R:up a b W: - 18 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
642 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
643 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
644 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
645 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
646 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
647 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
648 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
649 remote changed a which local deleted
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
650 use (c)hanged version or leave (d)eleted? c
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
651 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
652 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
653 a: prompt recreating -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
654 getting a
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
655 updating: a 1/3 files (33.33%)
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
656 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
657 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
658 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
659 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
660 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
661 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
662 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
663 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
664 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
665 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
666 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
667 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
668 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
669 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
670 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
671 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
672 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
673 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
674 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
675 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
676
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
677 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
678 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
679 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
680 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
681 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
682 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
683 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
684 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
685 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
686 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
687 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
18543
c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt
Mads Kiilerich <madski@unity3d.com>
parents: 18541
diff changeset
688 local changed a which remote deleted
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
689 use (c)hanged version or (d)elete? c
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
690 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
691 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
692 a: prompt keep -> a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
693 updating: a 1/3 files (33.33%)
23396
6a254a2dd37c merge: separate out "both created" cases
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
694 b: both created -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
695 updating: b 2/3 files (66.67%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
696 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
697 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
698 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
699 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
700 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
701 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
702 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
703 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
704 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
705 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
706 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
707 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
708 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
709 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
710 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
711 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
712 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
713 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
714
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
715 $ tm "up a " "um a b" " " "20 merge a and b to b, remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
716 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
717 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
718 test L:up a R:um a b W: - 20 merge a and b to b, remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
719 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
720 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
721 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
722 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
723 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
724 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
725 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
726 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
727 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
728 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
729 preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
730 preserving rev for resolve of rev
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
731 removing a
20945
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
732 b: remote moved from a -> m
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
733 updating: b 1/2 files (50.00%)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
734 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
735 merging a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
736 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
737 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
738 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
739 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
740 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
741 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
742 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
743 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
744 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
745 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
746 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
747 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
748 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
749 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
750 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
751 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
752
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
753 $ tm "um a b" "up a " " " "21 merge a and b to b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
754 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
755 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
756 test L:um a b R:up a W: - 21 merge a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
757 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
758 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
759 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
760 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
761 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
762 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
763 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
764 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
765 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
766 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
767 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
768 preserving rev for resolve of rev
20945
18adc15635a1 merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
769 b: local copied/moved from a -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
770 updating: b 1/2 files (50.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
771 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
772 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
773 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
774 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
775 merge tool returned: 0
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
776 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
777 updating: rev 2/2 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
778 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
779 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
780 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
781 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
782 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
783 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
784 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
785 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
786 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
787 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
788 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
789
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
790
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
791 m "nm a b" "um x a" " " "22 get a, keep b"
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
792
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
793 $ tm "nm a b" "up a c" " " "23 get c, keep b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
794 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
795 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
796 test L:nm a b R:up a c W: - 23 get c, keep b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
797 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
798 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
799 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
800 b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
801 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
802 c
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
803 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
804 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
805 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
806 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
807 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
808 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
809 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
810 preserving rev for resolve of rev
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
811 c: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
812 getting c
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
813 updating: c 1/3 files (33.33%)
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
814 b: local copied/moved from a -> m
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
815 updating: b 2/3 files (66.67%)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
816 picked tool 'python ../merge' for b (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
817 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
818 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
819 premerge successful
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
820 rev: versions differ -> m
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
821 updating: rev 3/3 files (100.00%)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
822 picked tool 'python ../merge' for rev (binary False symlink False)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
823 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
824 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
825 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob)
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
826 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
827 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
828 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
829 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
830 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
831 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
832 M c
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
833 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
834
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
835
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
836 $ cd ..
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
837
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
838
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
839 Systematic and terse testing of merge merges and ancestor calculation:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
840
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
841 Expected result:
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
842
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
843 \ a m1 m2 dst
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
844 0 - f f f "versions differ"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
845 1 f g g g "versions differ"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
846 2 f f f f "versions differ"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
847 3 f f g f+g "remote copied to " + f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
848 4 f f g g "remote moved to " + f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
849 5 f g f f+g "local copied to " + f2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
850 6 f g f g "local moved to " + f2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
851 7 - (f) f f "remote differs from untracked local"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
852 8 f (f) f f "remote differs from untracked local"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
853
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
854 $ hg init ancestortest
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
855 $ cd ancestortest
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
856 $ for x in 1 2 3 4 5 6 8; do mkdir $x; echo a > $x/f; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
857 $ hg ci -Aqm "a"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
858 $ mkdir 0
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
859 $ touch 0/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
860 $ hg mv 1/f 1/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
861 $ hg cp 5/f 5/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
862 $ hg mv 6/f 6/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
863 $ hg rm 8/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
864 $ for x in */*; do echo m1 > $x; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
865 $ hg ci -Aqm "m1"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
866 $ hg up -qr0
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
867 $ mkdir 0 7
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
868 $ touch 0/f 7/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
869 $ hg mv 1/f 1/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
870 $ hg cp 3/f 3/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
871 $ hg mv 4/f 4/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
872 $ for x in */*; do echo m2 > $x; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
873 $ hg ci -Aqm "m2"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
874 $ hg up -qr1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
875 $ mkdir 7 8
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
876 $ echo m > 7/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
877 $ echo m > 8/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
878 $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^updating:/,$d' 2> /dev/null
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
879 searching for copies back to rev 1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
880 unmatched files in local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
881 5/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
882 6/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
883 unmatched files in other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
884 3/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
885 4/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
886 7/f
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
887 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
888 0/f
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
889 1/g
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
890 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
891 src: '3/f' -> dst: '3/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
892 src: '4/f' -> dst: '4/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
893 src: '5/f' -> dst: '5/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
894 src: '6/f' -> dst: '6/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
895 checking for directory renames
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
896 resolving manifests
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
897 branchmerge: True, force: True, partial: False
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
898 ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
899 remote changed 8/f which local deleted
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
900 use (c)hanged version or leave (d)eleted? c
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
901 preserving 0/f for resolve of 0/f
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
902 preserving 1/g for resolve of 1/g
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
903 preserving 2/f for resolve of 2/f
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
904 preserving 3/f for resolve of 3/f
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
905 preserving 3/f for resolve of 3/g
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
906 preserving 4/f for resolve of 4/g
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
907 preserving 5/f for resolve of 5/f
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
908 preserving 5/g for resolve of 5/g
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
909 preserving 6/g for resolve of 6/g
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
910 preserving 7/f for resolve of 7/f
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
911 removing 4/f
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
912 8/f: prompt recreating -> g
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
913 getting 8/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
914 $ hg mani
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
915 0/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
916 1/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
917 2/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
918 3/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
919 4/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
920 5/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
921 5/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
922 6/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
923 $ for f in */*; do echo $f:; cat $f; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
924 0/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
925 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
926 0/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
927 0/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
928 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
929 0/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
930 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
931 0/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
932 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
933 1/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
934 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
935 1/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
936 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
937 1/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
938 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
939 1/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
940 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
941 1/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
942 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
943 2/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
944 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
945 2/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
946 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
947 2/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
948 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
949 2/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
950 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
951 2/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
952 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
953 3/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
954 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
955 3/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
956 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
957 3/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
958 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
959 3/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
960 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
961 3/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
962 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
963 3/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
964 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
965 3/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
966 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
967 3/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
968 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
969 3/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
970 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
971 3/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
972 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
973 4/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
974 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
975 4/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
976 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
977 4/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
978 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
979 4/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
980 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
981 4/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
982 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
983 5/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
984 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
985 5/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
986 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
987 5/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
988 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
989 5/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
990 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
991 5/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
992 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
993 5/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
994 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
995 5/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
996 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
997 5/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
998 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
999 5/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1000 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1001 5/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1002 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1003 6/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1004 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1005 6/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1006 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1007 6/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1008 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1009 6/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1010 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1011 6/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1012 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1013 7/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1014 m
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1015 7/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1016 7/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1017 m
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1018 7/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1019 m
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1020 7/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1021 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1022 8/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1023 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1024 $ cd ..