Mercurial > hg
comparison tests/test-rebase-mq-skip @ 11843:00f8e7837668 stable
rebase: recompute the set of skipped rev when using --continue (issue2330)
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 13 Aug 2010 18:02:02 +0200 |
| parents | 2313dc4d9817 |
| children |
comparison
equal
deleted
inserted
replaced
| 11842:71dab6955be0 | 11843:00f8e7837668 |
|---|---|
| 42 echo | 42 echo |
| 43 echo '% Rebase' | 43 echo '% Rebase' |
| 44 hg up -C qtip | 44 hg up -C qtip |
| 45 hg rebase | hidebackup | 45 hg rebase | hidebackup |
| 46 hg glog --template '{rev} {desc} tags: {tags}\n' | 46 hg glog --template '{rev} {desc} tags: {tags}\n' |
| 47 | |
| 48 echo | |
| 49 echo '% Now with --continue' | |
| 50 cd .. | |
| 51 hg init b | |
| 52 cd b | |
| 53 hg qinit -c # This must work even with a managed mq queue | |
| 54 | |
| 55 for i in r0 r1 r2 r3 r4 r5 r6; | |
| 56 do | |
| 57 echo $i > $i | |
| 58 hg ci -Am $i | |
| 59 done | |
| 60 hg qimport -r 1:tip | |
| 61 hg up 0 | |
| 62 for i in r1 r3 r7 r8; | |
| 63 do | |
| 64 echo $i > $i | |
| 65 hg ci -Am branch2-$i | |
| 66 done | |
| 67 echo somethingelse > r4 | |
| 68 hg ci -Am branch2-r4 | |
| 69 echo r6 > r6 | |
| 70 hg ci -Am branch2-r6 | |
| 71 | |
| 72 hg up qtip | |
| 73 HGMERGE=internal:fail hg rebase | hidebackup | |
| 74 HGMERGE=internal:local hg resolve --all | |
| 75 hg rebase --continue | hidebackup | |
| 76 hg glog --template '{rev} {desc} tags: {tags}\n' |