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