Mercurial > hg
annotate tests/test-rename-merge2.t @ 20647:70d02abff434
histedit: clean up lock imports
We are alread importing the release function from lock, no need
to actually import the module too.
author | Olle Lundberg <geek@nerd.sh> |
---|---|
date | Wed, 05 Mar 2014 22:02:45 +0100 |
parents | 3db9e798e004 |
children | 18adc15635a1 |
rev | line source |
---|---|
3252 | 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 | 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 |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
89 a: remote copied to b -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
90 preserving a for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
91 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
92 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
93 updating: a 1/2 files (50.00%) |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
98 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
99 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
|
100 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
101 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
102 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
|
103 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
104 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
105 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
106 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
107 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
108 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
109 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
110 $ 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
|
111 created new head |
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 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
|
114 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
115 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
116 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
117 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
|
118 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
|
119 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
120 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
121 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
122 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
124 a: remote is newer -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
125 b: local copied/moved to a -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
126 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
127 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
128 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
129 getting a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
130 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
131 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
132 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
|
133 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
134 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
135 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
136 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
137 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
|
138 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
139 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
140 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
|
141 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
142 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
143 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
144 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
145 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
146 -------------- |
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 $ 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
|
149 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
150 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
151 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
|
152 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
153 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
154 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
155 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
|
156 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
|
157 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
158 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
159 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
160 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
162 a: remote moved to b -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
163 preserving a for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
164 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
165 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
166 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
167 updating: a 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
168 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
|
169 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
170 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
171 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
172 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
173 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
|
174 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
175 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
176 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
|
177 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
178 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
179 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
180 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
181 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
182 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
183 $ 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
|
184 created new head |
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 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
|
187 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
188 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
189 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
190 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
|
191 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
|
192 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
193 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
194 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
195 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
197 b: local copied/moved to a -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
198 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
199 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
200 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
201 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
202 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
|
203 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
204 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
205 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
206 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
207 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
|
208 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
209 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
210 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
|
211 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
212 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
213 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
214 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
215 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
216 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
217 $ tm " " "nc a b" " " "5 get b" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
218 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
219 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
220 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
|
221 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
222 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
223 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
224 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
|
225 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
|
226 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
227 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
228 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
229 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
231 b: remote created -> g |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
232 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
233 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
234 getting b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
235 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
236 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
237 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
|
238 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
239 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
240 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
|
241 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
242 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
243 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
244 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
245 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
246 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
247 $ tm "nc a b" " " " " "6 nothing" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
248 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
249 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
250 test L:nc a b R: W: - 6 nothing |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
251 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
252 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
253 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
254 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
|
255 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
|
256 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
257 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
258 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
259 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
261 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
262 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
263 updating: rev 1/1 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
264 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
|
265 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
266 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
267 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
|
268 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
269 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
270 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
271 C b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
272 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
273 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
274 $ tm " " "nm a b" " " "7 get b" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
275 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
276 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
277 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
|
278 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
279 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
280 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
281 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
|
282 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
|
283 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
284 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
285 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
286 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
287 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
288 a: other deleted -> r |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
289 b: remote created -> g |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
290 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
291 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
292 removing a |
19095
5cc71484ee9c
merge: increase safety of parallel updating/removing on icasefs
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18634
diff
changeset
|
293 updating: a 1/3 files (33.33%) |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
294 getting b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
295 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
296 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
297 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
|
298 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
299 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
300 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
|
301 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
302 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
303 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
304 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
305 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
306 $ tm "nm a b" " " " " "8 nothing" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
307 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
308 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
309 test L:nm a b R: W: - 8 nothing |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
310 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
311 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
312 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
313 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
|
314 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
|
315 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
316 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
317 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
318 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
320 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
321 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
322 updating: rev 1/1 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
323 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
|
324 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
325 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
326 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
|
327 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
328 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
329 C b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
330 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
331 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
332 $ 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
|
333 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
334 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
335 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
|
336 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
337 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
|
338 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
|
339 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
340 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
341 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
342 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
343 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
344 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
345 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
346 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
347 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
348 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
|
349 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
351 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
352 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
|
353 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
354 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
355 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
|
356 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
357 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
358 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
359 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
360 |
3252 | 361 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
362 m "um a c" "um x c" " " "10 do merge with no ancestor" |
3252 | 363 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
364 $ 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
|
365 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
366 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
367 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
|
368 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
369 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
370 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
371 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
372 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
373 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
|
374 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
|
375 src: 'a' -> dst: 'b' ! |
18135
a6fe1b9cc68f
copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents:
16913
diff
changeset
|
376 src: 'a' -> dst: 'c' ! |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
377 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
378 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
379 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
380 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
381 a: divergent renames -> dr |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
382 c: remote created -> g |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
383 rev: versions differ -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
384 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
385 getting c |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
386 updating: c 1/3 files (33.33%) |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
387 updating: a 2/3 files (66.67%) |
12757
62c8f7691bc3
merge: make 'diverging renames' diagnostic a more helpful note.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12743
diff
changeset
|
388 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
|
389 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
390 c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
391 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
392 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
|
393 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
394 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
395 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
|
396 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
397 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
398 M c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
399 C b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
400 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
401 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
402 $ 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
|
403 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
404 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
405 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
|
406 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
407 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
|
408 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
|
409 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
410 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
411 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
412 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
413 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
414 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
415 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
416 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
417 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
418 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
|
419 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
420 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
421 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
422 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
|
423 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
424 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
425 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
|
426 (branch merge, don't forget to commit) |
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 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
429 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
430 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
431 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
432 $ 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
|
433 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
434 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
435 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
|
436 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
437 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
|
438 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
|
439 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
440 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
441 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
442 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
443 a: other deleted -> r |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
444 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
445 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
446 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
447 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
448 removing a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
449 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
450 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
451 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
|
452 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
453 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
454 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
455 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
|
456 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
457 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
458 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
|
459 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
460 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
461 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
462 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
463 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
464 $ 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
|
465 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
466 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
467 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
|
468 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
469 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
|
470 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
|
471 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
472 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
473 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
474 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
475 a: remote is newer -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
476 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
477 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
478 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
479 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
480 getting a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
481 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
482 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
483 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
|
484 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
485 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
486 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
487 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
|
488 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
489 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
490 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
|
491 (branch merge, don't forget to commit) |
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 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
494 M b |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
497 $ 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
|
498 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
499 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
500 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
|
501 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
502 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
|
503 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
|
504 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
505 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
506 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
507 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
508 a: other deleted -> r |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
509 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
510 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
511 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
512 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
513 removing a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
514 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
515 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
516 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
|
517 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
518 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
519 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
520 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
|
521 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
522 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
523 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
|
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 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
527 -------------- |
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 $ 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
|
530 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
531 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
532 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
|
533 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
534 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
|
535 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
|
536 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
537 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
538 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
539 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
540 a: remote is newer -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
541 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
542 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
543 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
544 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
545 getting a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
546 updating: a 1/3 files (33.33%) |
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@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
551 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
552 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
|
553 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
554 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
555 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
|
556 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
557 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
558 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
559 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
560 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
561 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
562 $ 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
|
563 created new head |
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 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
|
566 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
567 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
|
568 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
|
569 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
570 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
571 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
572 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
573 b: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
574 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
575 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
576 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
577 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
578 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
|
579 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
580 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
581 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
582 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
|
583 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
584 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
585 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
|
586 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
587 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
588 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
589 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
590 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
591 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
592 $ 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
|
593 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
594 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
595 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
|
596 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
597 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
|
598 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
|
599 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
600 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
601 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
602 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
603 remote changed a which local deleted |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
604 use (c)hanged version or leave (d)eleted? c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
605 a: prompt recreating -> g |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
606 b: versions differ -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
607 preserving b for resolve of b |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
608 rev: versions differ -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
609 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
610 getting a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
611 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
612 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
613 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
|
614 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
615 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
616 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
617 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
|
618 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
619 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
620 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
|
621 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
622 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
623 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
624 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
625 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
626 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
627 $ 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
|
628 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
629 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
630 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
|
631 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
632 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
|
633 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
|
634 b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
635 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
636 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
637 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
|
638 local changed a which remote deleted |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
639 use (c)hanged version or (d)elete? c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
640 a: prompt keep -> a |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
641 b: versions differ -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
642 preserving b for resolve of b |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
643 rev: versions differ -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
644 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
645 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
646 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
647 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
|
648 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
649 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
650 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
651 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
|
652 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
653 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
654 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
|
655 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
656 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
657 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
658 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
659 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
660 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
661 $ 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
|
662 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
663 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
664 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
|
665 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
666 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
667 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
668 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
|
669 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
|
670 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
671 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
672 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
673 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
674 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
675 a: remote moved to b -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
676 preserving a for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
677 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
678 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
679 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
680 updating: a 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
681 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
|
682 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
683 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
684 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
685 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
|
686 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
687 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
688 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
|
689 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
690 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
691 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
692 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
693 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
694 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
695 $ 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
|
696 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
697 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
698 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
|
699 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
700 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
701 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
702 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
|
703 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
|
704 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
705 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
706 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
707 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
708 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
709 b: local copied/moved to a -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
710 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
711 rev: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
712 preserving rev for resolve of rev |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
713 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
714 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
|
715 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
716 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
717 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
718 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
|
719 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
720 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
721 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
|
722 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
723 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
724 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
725 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
726 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
727 |
3252 | 728 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
729 m "nm a b" "um x a" " " "22 get a, keep b" |
3252 | 730 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
731 $ 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
|
732 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
733 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
734 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
|
735 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
736 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
737 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
738 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
739 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
740 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
|
741 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
|
742 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
743 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
744 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
745 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
746 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
747 b: local copied/moved to a -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
748 preserving b for resolve of b |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
749 c: remote created -> g |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
750 rev: versions differ -> m |
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
751 preserving rev for resolve of rev |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
752 getting c |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
753 updating: c 1/3 files (33.33%) |
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
754 updating: b 2/3 files (66.67%) |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
755 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
|
756 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
757 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
758 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
759 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
760 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
|
761 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
762 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
763 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
|
764 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
765 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
766 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
767 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
768 M c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
769 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
770 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
771 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
772 $ cd .. |
20637
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
773 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
774 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
775 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
|
776 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
777 Excpected result: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
778 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
779 \ a m1 m2 dst |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
780 0 - f f f "versions differ" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
781 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
|
782 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
|
783 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
|
784 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
|
785 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
|
786 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
|
787 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
|
788 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
|
789 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
790 $ hg init ancestortest |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
791 $ cd ancestortest |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
792 $ 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
|
793 $ hg ci -Aqm "a" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
794 $ mkdir 0 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
795 $ touch 0/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
796 $ hg mv 1/f 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
797 $ hg cp 5/f 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
798 $ hg mv 6/f 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
799 $ hg rm 8/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
800 $ 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
|
801 $ hg ci -Aqm "m1" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
802 $ hg up -qr0 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
803 $ mkdir 0 7 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
804 $ touch 0/f 7/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
805 $ hg mv 1/f 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
806 $ hg cp 3/f 3/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
807 $ hg mv 4/f 4/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
808 $ 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
|
809 $ hg ci -Aqm "m2" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
810 $ hg up -qr1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
811 $ mkdir 7 8 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
812 $ echo m > 7/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
813 $ echo m > 8/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
814 $ 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
|
815 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
|
816 unmatched files in local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
817 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
818 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
819 unmatched files in other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
820 3/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
821 4/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
822 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
|
823 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
|
824 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
|
825 1/g |
20637
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
826 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
|
827 src: '3/f' -> dst: '3/g' * |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
828 src: '4/f' -> dst: '4/g' * |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
829 src: '5/f' -> dst: '5/g' * |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
830 src: '6/f' -> dst: '6/g' * |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
831 checking for directory renames |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
832 resolving manifests |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
833 branchmerge: True, force: True, partial: False |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
834 ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
835 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
|
836 use (c)hanged version or leave (d)eleted? c |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
837 0/f: versions differ -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
838 preserving 0/f for resolve of 0/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
839 1/g: versions differ -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
840 preserving 1/g for resolve of 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
841 2/f: versions differ -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
842 preserving 2/f for resolve of 2/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
843 3/f: versions differ -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
844 preserving 3/f for resolve of 3/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
845 3/f: remote copied to 3/g -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
846 preserving 3/f for resolve of 3/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
847 4/f: remote moved to 4/g -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
848 preserving 4/f for resolve of 4/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
849 5/f: versions differ -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
850 preserving 5/f for resolve of 5/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
851 5/g: local copied/moved to 5/f -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
852 preserving 5/g for resolve of 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
853 6/g: local copied/moved to 6/f -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
854 preserving 6/g for resolve of 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
855 7/f: remote differs from untracked local -> m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
856 preserving 7/f for resolve of 7/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
857 8/f: prompt recreating -> g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
858 removing 4/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
859 getting 8/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
860 $ hg mani |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
861 0/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
862 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
863 2/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
864 3/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
865 4/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
866 5/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
867 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
868 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
869 $ 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
|
870 0/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
871 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
872 0/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
873 0/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
874 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
875 0/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
876 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
877 0/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
878 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
879 1/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
880 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
881 1/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
882 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
883 1/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
884 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
885 1/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
886 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
887 1/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
888 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
889 2/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
890 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
891 2/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
892 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
893 2/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
894 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
895 2/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
896 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
897 2/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
898 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
899 3/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
900 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
901 3/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
902 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
903 3/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
904 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
905 3/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
906 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
907 3/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
908 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
909 3/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
910 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
911 3/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
912 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
913 3/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
914 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
915 3/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
916 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
917 3/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
918 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
919 4/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
920 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
921 4/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
922 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
923 4/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
924 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
925 4/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
926 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
927 4/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
928 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
929 5/f: |
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 5/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
932 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
933 5/f.local: |
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 5/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
936 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
937 5/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
938 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
939 5/g: |
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 5/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
942 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
943 5/g.local: |
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 5/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
946 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
947 5/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
948 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
949 6/g: |
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 6/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
952 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
953 6/g.local: |
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 6/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
956 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
957 6/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
958 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
959 7/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
960 m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
961 7/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
962 7/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
963 m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
964 7/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
965 m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
966 7/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
967 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
968 8/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
969 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
970 $ cd .. |