124
124
* mybook 5:d67b21408fc0
128
Check that the right ancestors is used while rebasing a merge (issue4041)
130
$ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041
131
requesting all changes
135
added 11 changesets with 8 changes to 3 files (+1 heads)
136
updating to branch default
137
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
139
$ hg phase --draft --force 9
141
o changeset: 10:2f2496ddf49d
144
| | parent: 7:4c9fbe56a16f
145
| | parent: 9:e31216eec445
147
| | date: Thu Sep 05 12:59:39 2013 -0400
150
| o changeset: 9:e31216eec445
153
| | date: Thu Sep 05 12:59:10 2013 -0400
154
| | summary: more changes to f1
156
| o changeset: 8:8e4e2c1a07ae
158
| | | parent: 2:4bc80088dc6b
159
| | | parent: 6:400110238667
161
| | | date: Thu Sep 05 12:57:59 2013 -0400
162
| | | summary: bad merge
164
o | | changeset: 7:4c9fbe56a16f
166
| | parent: 2:4bc80088dc6b
168
| | date: Thu Sep 05 12:54:00 2013 -0400
169
| | summary: changed f1
171
| o changeset: 6:400110238667
173
| | parent: 4:12e8ec6bb010
175
| | date: Tue Sep 03 13:58:02 2013 -0400
176
| | summary: changed f2 on f2
178
| | @ changeset: 5:d79e2059b5c0
179
| | | parent: 3:8a951942e016
181
| | | date: Tue Sep 03 13:57:39 2013 -0400
182
| | | summary: changed f2 on default
184
| o | changeset: 4:12e8ec6bb010
187
| | date: Tue Sep 03 13:57:18 2013 -0400
188
| | summary: created f2 branch
190
| o changeset: 3:8a951942e016
191
| | parent: 0:24797d4f68de
193
| | date: Tue Sep 03 13:57:11 2013 -0400
194
| | summary: added f2.txt
196
o | changeset: 2:4bc80088dc6b
199
| | date: Tue Sep 03 13:56:20 2013 -0400
200
| | summary: added f1.txt
202
o | changeset: 1:ef53c9e6b608
205
| date: Tue Sep 03 13:55:26 2013 -0400
206
| summary: created f1 branch
208
o changeset: 0:24797d4f68de
210
date: Tue Sep 03 13:55:08 2013 -0400
211
summary: added default.txt
213
$ hg rebase -s9 -d2 --debug # use debug to really check merge base used
214
rebase onto 2 starting from [<changectx e31216eec445>]
215
rebasing: 9:e31216eec445 5/6 changesets (83.33%)
216
future parents are 2 and -1
218
update to 2:4bc80088dc6b
220
branchmerge: False, force: True, partial: False
221
ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
222
f2.txt: other deleted -> r
223
f1.txt: remote created -> g
225
updating: f2.txt 1/2 files (50.00%)
227
updating: f1.txt 2/2 files (100.00%)
228
merge against 9:e31216eec445
229
detach base 8:8e4e2c1a07ae
230
searching for copies back to rev 3
232
branchmerge: True, force: True, partial: False
233
ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
234
f1.txt: remote is newer -> g
236
updating: f1.txt 1/1 files (100.00%)
238
rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
239
future parents are 11 and 7
242
merge against 10:2f2496ddf49d
243
detach base 9:e31216eec445
244
searching for copies back to rev 3
246
branchmerge: True, force: True, partial: False
247
ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
248
f1.txt: remote is newer -> g
250
updating: f1.txt 1/1 files (100.00%)
252
rebase merging completed
253
update back to initial working directory parent
255
branchmerge: False, force: False, partial: False
256
ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
257
f1.txt: other deleted -> r
258
f2.txt: remote created -> g
260
updating: f1.txt 1/2 files (50.00%)
262
updating: f2.txt 2/2 files (100.00%)
265
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
266
e31216eec445e44352c5f01588856059466a24c9
267
2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
268
bundling: 1/3 changesets (33.33%)
269
bundling: 2/3 changesets (66.67%)
270
bundling: 3/3 changesets (100.00%)
271
bundling: 1/3 manifests (33.33%)
272
bundling: 2/3 manifests (66.67%)
273
bundling: 3/3 manifests (100.00%)
274
bundling: f1.txt 1/1 files (100.00%)
275
saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-backup.hg (glob)
278
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
279
19c888675e133ab5dff84516926a65672eaf04d9
280
2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
281
bundling: 1/3 changesets (33.33%)
282
bundling: 2/3 changesets (66.67%)
283
bundling: 3/3 changesets (100.00%)
284
bundling: 1/3 manifests (33.33%)
285
bundling: 2/3 manifests (66.67%)
286
bundling: 3/3 manifests (100.00%)
287
bundling: f1.txt 1/1 files (100.00%)
291
add changeset 4c9fbe56a16f
293
add changeset 19c888675e13
295
add changeset 2a7f09cac94c
297
manifests: 1/2 chunks (50.00%)
298
manifests: 2/2 chunks (100.00%)
299
manifests: 3/2 chunks (150.00%)
301
adding f1.txt revisions
302
files: 1/1 chunks (100.00%)
303
added 2 changesets with 2 changes to 1 files
304
removing unknown node e31216eec445 from 1-phase boundary
305
invalid branchheads cache (served): tip differs
307
updating the branch cache