Mercurial > hg
view tests/test-rebase-check-restore.t @ 12664:545ec1775021
merge: handle no file parent in backwards merge (issue2364)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 09 Oct 2010 14:50:20 -0500 |
parents | 6cc4b14fb76b |
children | b19b4c1df066 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > graphlog= > rebase= > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF $ hg init a $ cd a $ echo A > A $ hg add A $ hg ci -m A $ echo 'B' > B $ hg add B $ hg ci -m B $ echo C >> A $ hg ci -m C $ hg up -q -C 0 $ echo D >> A $ hg ci -m D created new head $ echo E > E $ hg add E $ hg ci -m E $ hg up -q -C 0 $ hg branch 'notdefault' marked working directory as branch notdefault $ echo F >> A $ hg ci -m F $ cd .. Rebasing B onto E - check keep: $ hg clone -q -u . a a1 $ cd a1 $ hg tglog @ 5: 'F' notdefault | | o 4: 'E' | | | o 3: 'D' |/ | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' $ hg rebase -s 1 -d 4 --keep merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue [255] Solve the conflict and go on: $ echo 'conflict solved' > A $ rm A.orig $ hg resolve -m A $ hg rebase --continue $ hg tglog @ 7: 'C' | o 6: 'B' | | o 5: 'F' notdefault | | o | 4: 'E' | | o | 3: 'D' |/ | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' $ cd .. Rebase F onto E - check keepbranches: $ hg clone -q -u . a a2 $ cd a2 $ hg tglog @ 5: 'F' notdefault | | o 4: 'E' | | | o 3: 'D' |/ | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' $ hg rebase -s 5 -d 4 --keepbranches merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue [255] Solve the conflict and go on: $ echo 'conflict solved' > A $ rm A.orig $ hg resolve -m A $ hg rebase --continue saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @ 5: 'F' notdefault | o 4: 'E' | o 3: 'D' | | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A'