annotate tests/test-rename-merge2.t @ 26920:4d1a96bb831f

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