Mercurial > hg
annotate tests/test-rename-merge2.t @ 13426:643b8212813e
store: remove pointless pathjoiner parameter
We can stop pretending that we have to support anything else
than '/' for concatenating path elements anywhere.
Windows deals just fine with '/' in file paths and we already
have plenty of places which produce paths containing '/'
anyway when running on Windows.
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 16 Feb 2011 15:02:30 +0100 |
parents | de793925862e |
children | ffb5c09ba822 |
rev | line source |
---|---|
3252 | 1 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
2 $ mkdir -p t |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
3 $ cd t |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
4 $ cat <<EOF > merge |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
5 > import sys, os |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
6 > f = open(sys.argv[1], "wb") |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
7 > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3])) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
8 > f.close() |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
9 > EOF |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
10 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
11 perform a test merge with possible renaming |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
12 args: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
13 $1 = action in local branch |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
14 $2 = action in remote branch |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
15 $3 = action in working dir |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
16 $4 = expected result |
3252 | 17 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
18 $ tm() |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
19 > { |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
20 > mkdir t |
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 > hg init |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
23 > echo "[merge]" >> .hg/hgrc |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
24 > echo "followcopies = 1" >> .hg/hgrc |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
25 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
26 > # base |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
27 > echo base > a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
28 > echo base > rev # used to force commits |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
29 > hg add a rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
30 > hg ci -m "base" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
31 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
32 > # remote |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
33 > echo remote > rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
34 > if [ "$2" != "" ] ; then $2 ; fi |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
35 > hg ci -m "remote" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
36 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
37 > # local |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
38 > hg co -q 0 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
39 > echo local > rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
40 > if [ "$1" != "" ] ; then $1 ; fi |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
41 > hg ci -m "local" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
42 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
43 > # working dir |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
44 > echo local > rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
45 > if [ "$3" != "" ] ; then $3 ; fi |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
46 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
47 > # merge |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
48 > echo "--------------" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
49 > echo "test L:$1 R:$2 W:$3 - $4" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
50 > echo "--------------" |
12788
de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
Steve Borho <steve@borho.org>
parents:
12757
diff
changeset
|
51 > hg merge -y --debug --traceback --tool="python ../merge" |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
52 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
53 > echo "--------------" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
54 > hg status -camC -X rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
55 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
56 > hg ci -m "merge" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
57 > |
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 > echo |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
60 > |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
61 > cd .. |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
62 > rm -r t |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
63 > } |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
64 $ up() { |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
65 > cp rev $1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
66 > hg add $1 2> /dev/null |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
67 > if [ "$2" != "" ] ; then |
12743
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12484
diff
changeset
|
68 > cp rev $2 |
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12484
diff
changeset
|
69 > hg add $2 2> /dev/null |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
70 > fi |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
71 > } |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
72 $ uc() { up $1; hg cp $1 $2; } # update + copy |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
73 $ um() { up $1; hg mv $1 $2; } |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
74 $ nc() { hg cp $1 $2; } # just copy |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
75 $ nm() { hg mv $1 $2; } # just move |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
76 $ 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
|
77 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
78 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
79 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
|
80 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
81 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
82 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
83 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
84 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
85 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
86 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
87 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
88 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
89 ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
90 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
91 a: remote copied to b -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
92 preserving a for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
93 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
94 updating: a 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
95 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
|
96 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
97 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
98 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
99 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
100 picked tool 'python ../merge' for rev (binary False symlink False) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
101 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
103 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
|
104 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
105 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
106 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
107 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
108 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
109 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
110 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
111 $ 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
|
112 created new head |
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 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
|
115 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
116 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
117 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
118 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
119 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
120 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
121 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
122 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
123 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
124 ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
125 a: remote is newer -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
126 b: local copied/moved to a -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
127 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
128 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
129 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
130 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
131 getting a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
132 updating: b 2/3 files (66.67%) |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
137 updating: rev 3/3 files (100.00%) |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
141 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
|
142 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
143 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
144 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
145 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
146 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
147 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
148 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
149 $ 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
|
150 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
151 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
152 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
|
153 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
154 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
155 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
156 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
157 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
158 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
159 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
160 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
161 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
162 ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
163 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
164 a: remote moved to b -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
165 preserving a for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
166 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
167 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
168 updating: a 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
169 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
|
170 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
171 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
172 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
173 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
174 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
|
175 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
176 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
177 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
|
178 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
179 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
180 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
181 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
182 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
183 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
184 $ 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
|
185 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
186 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
187 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
|
188 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
189 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
190 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
191 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
192 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
193 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
194 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
195 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
196 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
197 ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
198 b: local copied/moved to a -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
199 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
200 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
201 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
202 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
203 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
|
204 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
205 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
206 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
207 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
208 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
|
209 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
210 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
211 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
|
212 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
213 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
214 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
215 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
216 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
217 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
218 $ tm " " "nc a b" " " "5 get b" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
219 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
220 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
221 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
|
222 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
223 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
224 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
225 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
226 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
227 b -> a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
228 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
229 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
230 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
231 ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
232 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
233 b: remote created -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
234 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
235 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
236 getting b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
237 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
238 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
|
239 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
240 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
241 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
|
242 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
243 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
244 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
245 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
246 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
247 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
248 $ tm "nc a b" " " " " "6 nothing" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
249 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
250 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
251 test L:nc a b R: W: - 6 nothing |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
252 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
253 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
254 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
255 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
256 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
257 b -> a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
258 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
259 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
260 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
261 ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
262 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
263 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
264 updating: rev 1/1 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
265 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
|
266 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
267 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
268 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
|
269 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
270 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
271 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
272 C b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
273 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
274 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
275 $ tm " " "nm a b" " " "7 get b" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
276 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
277 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
278 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
|
279 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
280 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
281 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
282 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
283 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
284 b -> a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
285 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
286 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
287 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
288 ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
289 a: other deleted -> r |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
290 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
291 b: remote created -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
292 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
293 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
294 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
295 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
296 getting b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
297 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
298 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
|
299 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
300 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
301 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
|
302 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
303 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
304 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
305 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
306 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
307 $ tm "nm a b" " " " " "8 nothing" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
308 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
309 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
310 test L:nm a b R: W: - 8 nothing |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
311 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
312 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
313 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
314 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
315 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
316 b -> a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
317 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
318 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
319 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
320 ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
321 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
322 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
323 updating: rev 1/1 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
324 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
|
325 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
326 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
327 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
|
328 (branch merge, don't forget to commit) |
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 C b |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
333 $ 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
|
334 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
335 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
336 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
|
337 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
338 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
339 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
340 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
341 ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
342 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
343 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
344 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
345 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
346 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
347 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
|
348 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
349 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
350 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
351 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
|
352 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
353 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
354 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
|
355 (branch merge, don't forget to commit) |
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 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
358 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
359 |
3252 | 360 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
361 m "um a c" "um x c" " " "10 do merge with no ancestor" |
3252 | 362 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
363 $ 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
|
364 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
365 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
366 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
|
367 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
368 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
369 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
370 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
371 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
372 c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
373 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
374 c -> a ! |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
375 b -> a ! |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
376 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
377 a: divergent renames -> dr |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
378 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
379 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
380 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
381 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
382 c: remote created -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
383 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
384 updating: a 1/3 files (33.33%) |
12757
62c8f7691bc3
merge: make 'diverging renames' diagnostic a more helpful note.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12743
diff
changeset
|
385 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
|
386 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
387 c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
388 updating: c 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
389 getting c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
390 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
391 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
|
392 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
393 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
394 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
|
395 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
396 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
397 M c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
398 C b |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
401 $ 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
|
402 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
403 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
404 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
|
405 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
406 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
407 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
408 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
409 ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
410 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
411 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
412 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
413 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
414 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
415 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
|
416 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
417 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
418 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
419 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
|
420 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
421 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
422 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
|
423 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
424 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
425 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
426 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
427 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
428 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
429 $ 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
|
430 created new head |
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 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
|
433 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
434 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
435 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
436 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
437 ancestor 924404dff337 local 59318016310c+ remote bdb19105162a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
438 a: other deleted -> r |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
439 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
440 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
441 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
442 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
443 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
444 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
445 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
446 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
|
447 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
448 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
449 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
450 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
|
451 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
452 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
453 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
|
454 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
455 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
456 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
457 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
458 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
459 $ 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
|
460 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
461 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
462 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
|
463 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
464 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
465 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
466 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
467 ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
468 a: remote is newer -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
469 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
470 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
471 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
472 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
473 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
474 getting a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
475 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
476 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
|
477 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
478 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
479 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
480 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
|
481 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
482 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
483 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
|
484 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
485 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
486 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
487 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
488 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
489 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
490 $ 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
|
491 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
492 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
493 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
|
494 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
495 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
496 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
497 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
498 ancestor 924404dff337 local 59318016310c+ remote bdb19105162a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
499 a: other deleted -> r |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
500 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
501 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
502 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
503 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
504 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
505 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
506 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
507 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
|
508 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
509 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
510 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
511 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
|
512 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
513 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
514 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
|
515 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
516 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
517 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
518 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
519 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
520 $ 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
|
521 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
522 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
523 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
|
524 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
525 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
526 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
527 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
528 ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
529 a: remote is newer -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
530 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
531 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
532 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
533 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
534 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
535 getting a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
536 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
537 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
|
538 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
539 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
540 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
541 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
|
542 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
543 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
544 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
|
545 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
546 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
547 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
548 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
549 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
550 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
551 $ 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
|
552 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
553 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
554 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
|
555 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
556 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
557 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
558 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
559 ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
560 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
561 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
562 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
563 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
564 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
565 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
|
566 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
567 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
568 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
569 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
|
570 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
571 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
572 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
|
573 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
574 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
575 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
576 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
577 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
578 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
579 $ 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
|
580 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
581 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
582 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
|
583 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
584 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
585 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
586 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
587 ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
588 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
589 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
590 remote changed a which local deleted |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
591 use (c)hanged version or leave (d)eleted? c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
592 a: prompt recreating -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
593 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
594 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
595 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
596 getting a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
597 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
598 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
|
599 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
600 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
601 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
602 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
|
603 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
604 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
605 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
|
606 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
607 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
608 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
609 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
610 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
611 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
612 $ 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
|
613 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
614 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
615 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
|
616 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
617 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
618 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
619 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
620 ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
621 local changed a which remote deleted |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
622 use (c)hanged version or (d)elete? c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
623 a: prompt keep -> a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
624 b: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
625 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
626 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
627 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
628 updating: a 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
629 updating: b 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
630 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
|
631 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
632 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
633 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
634 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
|
635 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
636 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
637 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
|
638 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
639 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
640 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
641 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
642 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
643 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
644 $ 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
|
645 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
646 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
647 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
|
648 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
649 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
650 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
651 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
652 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
653 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
654 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
655 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
656 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
657 ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
658 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
659 a: remote moved to b -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
660 preserving a for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
661 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
662 removing a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
663 updating: a 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
664 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
|
665 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
666 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
667 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
668 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
|
669 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
670 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
671 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
|
672 (branch merge, don't forget to commit) |
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 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
675 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
676 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
677 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
678 $ 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
|
679 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
680 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
681 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
|
682 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
683 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
684 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
685 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
686 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
687 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
688 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
689 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
690 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
691 ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
692 b: local copied/moved to a -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
693 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
694 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
695 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
696 updating: b 1/2 files (50.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
697 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
|
698 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
699 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
700 updating: rev 2/2 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
701 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
|
702 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
703 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
704 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
|
705 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
706 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
707 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
708 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
709 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
710 |
3252 | 711 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
712 m "nm a b" "um x a" " " "22 get a, keep b" |
3252 | 713 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
714 $ 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
|
715 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
716 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
717 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
|
718 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
719 searching for copies back to rev 1 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
720 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
721 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
722 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
723 c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
724 all copies found (* = to merge, ! = divergent): |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
725 b -> a * |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
726 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
727 resolving manifests |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
728 overwrite None partial False |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
729 ancestor 924404dff337 local 02963e448370+ remote 2b958612230f |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
730 b: local copied/moved to a -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
731 rev: versions differ -> m |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
732 c: remote created -> g |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
733 preserving b for resolve of b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
734 preserving rev for resolve of rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
735 updating: b 1/3 files (33.33%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
736 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
|
737 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
738 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
739 premerge successful |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
740 updating: c 2/3 files (66.67%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
741 getting c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
742 updating: rev 3/3 files (100.00%) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
743 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
|
744 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
745 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
746 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
|
747 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
748 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
749 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
750 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
751 M c |
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 |