diff options
Diffstat (limited to 'tests/test-rebase-mq.t')
| -rw-r--r-- | tests/test-rebase-mq.t | 68 |
1 files changed, 20 insertions, 48 deletions
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t index 7301ebe..3d3579c 100644 --- a/tests/test-rebase-mq.t +++ b/tests/test-rebase-mq.t @@ -62,7 +62,7 @@ Rebase - generate a conflict: $ hg rebase -s 2 -d 1 merging f warning: conflicts during merge. - merging f incomplete! (edit conflicts, then use 'hg resolve --mark') + merging f failed! abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] @@ -73,7 +73,7 @@ Fix the 1st conflict: $ hg rebase -c merging f warning: conflicts during merge. - merging f incomplete! (edit conflicts, then use 'hg resolve --mark') + merging f failed! abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] @@ -235,7 +235,6 @@ Rebase the applied mq patches: -mq1 +mq2 - $ cd .. Rebase with guards @@ -245,48 +244,32 @@ Rebase with guards $ hg ci -Am a adding a -Create mq repo with guarded patches foo and bar and empty patch: +Create mq repo with guarded patches foo and bar: $ hg qinit - $ echo guarded > guarded - $ hg add guarded - $ hg qnew guarded - $ hg qnew empty-important -m 'important commit message' - $ echo bar > bar - $ hg add bar - $ hg qnew bar + $ hg qnew foo + $ hg qguard foo +baz $ echo foo > foo $ hg add foo - $ hg qnew foo - $ hg qpop -a + $ hg qref + $ hg qpop popping foo - popping bar - popping empty-important - popping guarded patch queue now empty - $ hg qguard guarded +guarded + + $ hg qnew bar $ hg qguard bar +baz - $ hg qguard foo +baz - $ hg qselect baz - number of unguarded, unapplied patches has changed from 1 to 3 - $ hg qpush bar - applying empty-important - patch empty-important is empty - applying bar - now at: bar + $ echo bar > bar + $ hg add bar + $ hg qref $ hg qguard -l - guarded: +guarded - empty-important: unguarded bar: +baz foo: +baz $ hg tglog - @ 2: 'imported patch bar' tags: bar qtip tip + @ 1:* '[mq]: bar' tags: bar qbase qtip tip (glob) | - o 1: 'important commit message' tags: empty-important qbase - | - o 0: 'a' tags: qparent + o 0:* 'a' tags: qparent (glob) Create new head to rebase bar onto: @@ -296,40 +279,30 @@ Create new head to rebase bar onto: $ hg add b $ hg ci -m b created new head - $ hg up -C 2 + $ hg up -C 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a >> a $ hg qref $ hg tglog - @ 3: '[mq]: bar' tags: bar qtip tip + @ 2:* '[mq]: bar' tags: bar qbase qtip tip (glob) | - | o 2: 'b' tags: - | | - o | 1: 'important commit message' tags: empty-important qbase + | o 1:* 'b' tags: (glob) |/ - o 0: 'a' tags: qparent + o 0:* 'a' tags: qparent (glob) -Rebase bar (make sure series order is preserved and empty-important also is -removed from the series): +Rebase bar (make sure series order is preserved): $ hg qseries - guarded - empty-important bar foo - $ [ -f .hg/patches/empty-important ] - $ hg -q rebase -d 2 + $ hg -q rebase -d 1 $ hg qseries - guarded bar foo - $ [ -f .hg/patches/empty-important ] - [1] $ hg qguard -l - guarded: +guarded bar: +baz foo: +baz @@ -340,4 +313,3 @@ removed from the series): | o 0:* 'a' tags: (glob) - $ cd .. |