Mercurial > hg
annotate tests/test-rename-merge2.out @ 6679:d286ec1bdcff
context: fix workingctx.fileflags() execute bit
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 15 Jun 2008 13:01:01 +0200 |
parents | 4b0c9c674707 |
children | 368a4ec603cc |
rev | line source |
---|---|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
1 created new head |
3252 | 2 -------------- |
3 test L:up a R:nc a b W: - 1 get local a to b | |
4 -------------- | |
5 resolving manifests | |
3314 | 6 overwrite None partial False |
7 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
8 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
9 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
10 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
11 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
12 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
13 checking for directory renames |
3252 | 14 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
15 a: remote copied to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
16 copying a to b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
17 picked tool 'python ../merge' for a (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
18 merging a and b |
3314 | 19 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
20 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
21 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 22 merging rev |
3314 | 23 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 24 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
25 (branch merge, don't forget to commit) | |
26 -------------- | |
27 M b | |
28 a | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
29 C a |
3252 | 30 -------------- |
31 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
32 created new head |
3252 | 33 -------------- |
34 test L:nc a b R:up a W: - 2 get rem change to a and b | |
35 -------------- | |
36 resolving manifests | |
3314 | 37 overwrite None partial False |
38 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
39 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
40 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
41 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
42 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
43 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
44 checking for directory renames |
3252 | 45 a: remote is newer -> g |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
46 b: local copied to a -> m |
3252 | 47 rev: versions differ -> m |
48 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
49 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
50 merging b and a |
3314 | 51 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
52 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
53 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 54 merging rev |
3314 | 55 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 56 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
57 (branch merge, don't forget to commit) | |
58 -------------- | |
59 M a | |
60 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
61 a |
3252 | 62 -------------- |
63 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
64 created new head |
3252 | 65 -------------- |
66 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
67 -------------- | |
68 resolving manifests | |
3314 | 69 overwrite None partial False |
70 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
71 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
72 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
73 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
74 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
75 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
76 checking for directory renames |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
77 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
78 a: remote moved to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
79 copying a to b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
80 picked tool 'python ../merge' for a (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
81 merging a and b |
3314 | 82 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
83 premerge successful |
3252 | 84 removing a |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
85 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 86 merging rev |
3314 | 87 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 88 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
89 (branch merge, don't forget to commit) | |
90 -------------- | |
91 M b | |
92 a | |
93 -------------- | |
94 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
95 created new head |
3252 | 96 -------------- |
97 test L:nm a b R:up a W: - 4 get remote change to b | |
98 -------------- | |
99 resolving manifests | |
3314 | 100 overwrite None partial False |
101 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
102 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
103 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
104 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
105 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
106 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
107 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
108 b: local moved to a -> m |
3252 | 109 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
110 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
111 merging b and a |
3314 | 112 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
113 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
114 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 115 merging rev |
3314 | 116 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 117 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
118 (branch merge, don't forget to commit) | |
119 -------------- | |
120 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
121 a |
3252 | 122 -------------- |
123 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
124 created new head |
3252 | 125 -------------- |
126 test L: R:nc a b W: - 5 get b | |
127 -------------- | |
128 resolving manifests | |
3314 | 129 overwrite None partial False |
130 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
131 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
132 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
133 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
134 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
135 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
136 checking for directory renames |
3252 | 137 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
138 b: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
139 getting b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
140 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 141 merging rev |
3314 | 142 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3400
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
143 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 144 (branch merge, don't forget to commit) |
145 -------------- | |
146 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
147 C a |
3252 | 148 -------------- |
149 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
150 created new head |
3252 | 151 -------------- |
152 test L:nc a b R: W: - 6 nothing | |
153 -------------- | |
154 resolving manifests | |
3314 | 155 overwrite None partial False |
156 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
157 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
158 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
159 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
160 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
161 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
162 checking for directory renames |
3252 | 163 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
164 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 165 merging rev |
3314 | 166 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
167 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 168 (branch merge, don't forget to commit) |
169 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
170 C a |
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
171 C b |
3252 | 172 -------------- |
173 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
174 created new head |
3252 | 175 -------------- |
176 test L: R:nm a b W: - 7 get b | |
177 -------------- | |
178 resolving manifests | |
3314 | 179 overwrite None partial False |
180 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
181 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
182 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
183 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
184 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
185 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
186 checking for directory renames |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
187 a: other deleted -> r |
3252 | 188 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
189 b: remote created -> g |
3252 | 190 removing a |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
191 getting b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
192 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 193 merging rev |
3314 | 194 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
195 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
3252 | 196 (branch merge, don't forget to commit) |
197 -------------- | |
198 M b | |
199 -------------- | |
200 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
201 created new head |
3252 | 202 -------------- |
203 test L:nm a b R: W: - 8 nothing | |
204 -------------- | |
205 resolving manifests | |
3314 | 206 overwrite None partial False |
207 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
208 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
209 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
210 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
211 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
212 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
213 checking for directory renames |
3252 | 214 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
215 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 216 merging rev |
3314 | 217 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
218 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 219 (branch merge, don't forget to commit) |
220 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
221 C b |
3252 | 222 -------------- |
223 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
224 created new head |
3252 | 225 -------------- |
226 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
227 -------------- | |
228 resolving manifests | |
3314 | 229 overwrite None partial False |
230 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
231 searching for copies back to rev 1 |
3252 | 232 b: versions differ -> m |
233 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
234 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 235 merging b |
3314 | 236 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
237 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 238 merging rev |
3314 | 239 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 240 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
241 (branch merge, don't forget to commit) | |
242 -------------- | |
243 M b | |
244 -------------- | |
245 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
246 created new head |
3252 | 247 -------------- |
248 test L:nm a b R:nm a c W: - 11 get c, keep b | |
249 -------------- | |
250 resolving manifests | |
3314 | 251 overwrite None partial False |
252 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
253 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
254 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
255 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
256 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
257 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
258 all copies found (* = to merge, ! = divergent): |
5857
c704b03884ef
merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
259 c -> a ! |
c704b03884ef
merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
260 b -> a ! |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
261 checking for directory renames |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
262 a: divergent renames -> dr |
3252 | 263 rev: versions differ -> m |
264 c: remote created -> g | |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
265 warning: detected divergent renames of a to: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
266 b |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
267 c |
3252 | 268 getting c |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
269 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 270 merging rev |
3314 | 271 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
3252 | 272 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
273 (branch merge, don't forget to commit) | |
274 -------------- | |
275 M c | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
276 C b |
3252 | 277 -------------- |
278 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
279 created new head |
3252 | 280 -------------- |
281 test L:nc a b R:up b W: - 12 merge b no ancestor | |
282 -------------- | |
283 resolving manifests | |
3314 | 284 overwrite None partial False |
285 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
286 searching for copies back to rev 1 |
3252 | 287 b: versions differ -> m |
288 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
289 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 290 merging b |
3314 | 291 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
292 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 293 merging rev |
3314 | 294 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
3252 | 295 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
296 (branch merge, don't forget to commit) | |
297 -------------- | |
298 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
299 C a |
3252 | 300 -------------- |
301 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
302 created new head |
3252 | 303 -------------- |
304 test L:up b R:nm a b W: - 13 merge b no ancestor | |
305 -------------- | |
306 resolving manifests | |
3314 | 307 overwrite None partial False |
308 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
309 searching for copies back to rev 1 |
3252 | 310 a: other deleted -> r |
311 b: versions differ -> m | |
312 rev: versions differ -> m | |
313 removing a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
314 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 315 merging b |
3314 | 316 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
317 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 318 merging rev |
3314 | 319 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 320 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
321 (branch merge, don't forget to commit) | |
322 -------------- | |
323 M b | |
324 -------------- | |
325 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
326 created new head |
3252 | 327 -------------- |
328 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
329 -------------- | |
330 resolving manifests | |
3314 | 331 overwrite None partial False |
332 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
333 searching for copies back to rev 1 |
3252 | 334 a: remote is newer -> g |
335 b: versions differ -> m | |
336 rev: versions differ -> m | |
337 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
338 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 339 merging b |
3314 | 340 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
341 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 342 merging rev |
3314 | 343 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 344 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
345 (branch merge, don't forget to commit) | |
346 -------------- | |
347 M a | |
348 M b | |
349 -------------- | |
350 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
351 created new head |
3252 | 352 -------------- |
353 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
354 -------------- | |
355 resolving manifests | |
3314 | 356 overwrite None partial False |
357 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
358 searching for copies back to rev 1 |
3252 | 359 a: other deleted -> r |
360 b: versions differ -> m | |
361 rev: versions differ -> m | |
362 removing a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
363 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 364 merging b |
3314 | 365 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
366 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 367 merging rev |
3314 | 368 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 369 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
370 (branch merge, don't forget to commit) | |
371 -------------- | |
372 M b | |
373 -------------- | |
374 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
375 created new head |
3252 | 376 -------------- |
3281 | 377 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
3252 | 378 -------------- |
379 resolving manifests | |
3314 | 380 overwrite None partial False |
381 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
382 searching for copies back to rev 1 |
3252 | 383 a: remote is newer -> g |
384 b: versions differ -> m | |
385 rev: versions differ -> m | |
386 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
387 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 388 merging b |
3314 | 389 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
390 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 391 merging rev |
3314 | 392 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 393 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
394 (branch merge, don't forget to commit) | |
395 -------------- | |
396 M a | |
397 M b | |
398 -------------- | |
399 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
400 created new head |
3252 | 401 -------------- |
3281 | 402 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
3252 | 403 -------------- |
404 resolving manifests | |
3314 | 405 overwrite None partial False |
406 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
407 searching for copies back to rev 1 |
3252 | 408 b: versions differ -> m |
409 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
410 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 411 merging b |
3314 | 412 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
413 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 414 merging rev |
3314 | 415 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 416 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
417 (branch merge, don't forget to commit) | |
418 -------------- | |
419 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
420 C a |
3252 | 421 -------------- |
422 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
423 created new head |
3252 | 424 -------------- |
425 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
426 -------------- | |
427 resolving manifests | |
3314 | 428 overwrite None partial False |
429 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
430 searching for copies back to rev 1 |
3252 | 431 b: versions differ -> m |
432 rev: versions differ -> m | |
433 a: prompt recreating -> g | |
434 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
435 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 436 merging b |
3314 | 437 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
438 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 439 merging rev |
3314 | 440 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 441 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
442 (branch merge, don't forget to commit) | |
443 -------------- | |
444 M a | |
445 M b | |
446 -------------- | |
447 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
448 created new head |
3252 | 449 -------------- |
3281 | 450 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
3252 | 451 -------------- |
452 resolving manifests | |
3314 | 453 overwrite None partial False |
454 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
455 searching for copies back to rev 1 |
3252 | 456 b: versions differ -> m |
457 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
458 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 459 merging b |
3314 | 460 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
461 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 462 merging rev |
3314 | 463 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 464 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
465 (branch merge, don't forget to commit) | |
466 -------------- | |
467 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
468 C a |
3252 | 469 -------------- |
470 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
471 created new head |
3252 | 472 -------------- |
473 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
474 -------------- | |
475 resolving manifests | |
3314 | 476 overwrite None partial False |
477 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
478 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
479 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
480 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
481 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
482 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
483 checking for directory renames |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
484 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
485 a: remote moved to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
486 copying a to b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
487 picked tool 'python ../merge' for a (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
488 merging a and b |
3314 | 489 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
3252 | 490 removing a |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
491 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 492 merging rev |
3314 | 493 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 494 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
495 (branch merge, don't forget to commit) | |
496 -------------- | |
497 M b | |
498 a | |
499 -------------- | |
500 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
501 created new head |
3252 | 502 -------------- |
503 test L:um a b R:up a W: - 21 merge a and b to b | |
504 -------------- | |
505 resolving manifests | |
3314 | 506 overwrite None partial False |
507 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
508 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
509 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
510 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
511 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
512 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
513 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
514 b: local moved to a -> m |
3252 | 515 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
516 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
517 merging b and a |
3314 | 518 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
519 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 520 merging rev |
3314 | 521 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 522 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
523 (branch merge, don't forget to commit) | |
524 -------------- | |
525 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
526 a |
3252 | 527 -------------- |
528 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
529 created new head |
3252 | 530 -------------- |
531 test L:nm a b R:up a c W: - 23 get c, keep b | |
532 -------------- | |
533 resolving manifests | |
3314 | 534 overwrite None partial False |
535 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
536 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
537 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
538 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
539 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
540 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
541 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
542 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
543 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
544 b: local moved to a -> m |
3252 | 545 rev: versions differ -> m |
546 c: remote created -> g | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
547 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
548 merging b and a |
3314 | 549 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
550 premerge successful |
3252 | 551 getting c |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
552 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 553 merging rev |
3314 | 554 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
3252 | 555 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
556 (branch merge, don't forget to commit) | |
557 -------------- | |
558 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
559 a |
3252 | 560 M c |
561 -------------- | |
562 |