diff options
Diffstat (limited to 'tests/test-mq-merge.t')
| -rw-r--r-- | tests/test-mq-merge.t | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/tests/test-mq-merge.t b/tests/test-mq-merge.t index 955134a..f1640d2 100644 --- a/tests/test-mq-merge.t +++ b/tests/test-mq-merge.t @@ -56,7 +56,7 @@ Create a patch removing a: Save the patch queue so we can merge it later: $ hg qsave -c -e - copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob) + copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 $ checkundo Update b and commit in an "update" changeset: @@ -76,7 +76,7 @@ Update b and commit in an "update" changeset: b $ hg qpush -a -m - merging with queue at: $TESTTMP/t/.hg/patches.1 (glob) + merging with queue at: $TESTTMP/t/.hg/patches.1 applying rm_a now at: rm_a @@ -115,20 +115,22 @@ Classic MQ merge sequence *with an explicit named queue*: Create the reference queue: $ hg qsave -c -e -n refqueue - copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob) + copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue $ hg up -C 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved Merge: $ HGMERGE=internal:other hg qpush -a -m -n refqueue - merging with queue at: $TESTTMP/t2/.hg/refqueue (glob) + merging with queue at: $TESTTMP/t2/.hg/refqueue applying patcha patching file a - Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). - fuzz found when applying patch, stopping + Hunk #1 FAILED at 0 + 1 out of 1 hunks FAILED -- saving rejects to file a.rej + patch failed, unable to continue (try -v) + patch failed, rejects left in working dir patch didn't work out, merging patcha - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) applying patcha2 @@ -147,11 +149,13 @@ Check patcha is still a git patch: -b +a +c - diff --git a/aa b/aa - new file mode 100644 - --- /dev/null + diff --git a/a b/aa + copy from a + copy to aa + --- a/a +++ b/aa - @@ -0,0 +1,1 @@ + @@ -1,1 +1,1 @@ + -b +a Check patcha2 is still a regular patch: |