##// END OF EJS Templates
tests: test rebase of merge of target ancestors
Mads Kiilerich -
r23408:36dcd3db default
parent child Browse files
Show More
@@ -256,3 +256,51 b' Test order of parents of rebased merged '
256 |/
256 |/
257 o 0: 'common'
257 o 0: 'common'
258
258
259 rebase of merge of ancestors
260
261 $ hg up -qr 2
262 $ hg merge -qr 3
263 $ echo 'other change while merging future "rebase ancestors"' > other
264 $ hg ci -Aqm 'merge rebase ancestors'
265 $ hg rebase -d 5 -v
266 resolving manifests
267 removing other
268 note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf
269
270 calculating bids for ancestor a60552eb93fb
271 resolving manifests
272
273 calculating bids for ancestor f59da8fc0fcf
274 resolving manifests
275
276 auction for merging merge bids
277 other: consensus for g
278 end of auction
279
280 getting other
281 other
282 rebase merging completed
283 1 changesets found
284 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-backup.hg (glob)
285 1 changesets found
286 adding branch
287 adding changesets
288 adding manifests
289 adding file changes
290 added 1 changesets with 1 changes to 1 files
291 rebase completed
292 $ hg tglog
293 @ 6: 'merge rebase ancestors'
294 |
295 o 5: 'merge p1 1=ancestor p2 3=outside'
296 |\
297 +---o 4: 'merge p1 3=outside p2 1=ancestor'
298 | |/
299 | o 3: 'outside'
300 | |
301 o | 2: 'target'
302 | |
303 o | 1: 'change'
304 |/
305 o 0: 'common'
306
General Comments 0
You need to be logged in to leave comments. Login now