diff options
Diffstat (limited to 'tests/test-impexp-branch.t')
| -rw-r--r-- | tests/test-impexp-branch.t | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/test-impexp-branch.t b/tests/test-impexp-branch.t index c089a46..fbe9aac 100644 --- a/tests/test-impexp-branch.t +++ b/tests/test-impexp-branch.t @@ -1,6 +1,3 @@ - $ echo '[extensions]' >> $HGRCPATH - $ echo 'mq =' >> $HGRCPATH - $ cat >findbranch.py <<EOF > import re, sys > @@ -22,7 +19,6 @@ $ hg commit -m "No branch." $ hg branch abranch marked working directory as branch abranch - (branches are permanent and global, did you want a bookmark?) $ echo "Rev 2" >rev $ hg commit -m "With branch." @@ -58,16 +54,3 @@ Make sure import still works with branch information in patches. applying ../r0.patch $ hg import --exact ../r1.patch applying ../r1.patch - -Test --exact and patch header separators (issue3356) - - $ hg strip --no-backup . - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - >>> import re - >>> p = file('../r1.patch', 'rb').read() - >>> p = re.sub(r'Parent\s+', 'Parent ', p) - >>> file('../r1-ws.patch', 'wb').write(p) - $ hg import --exact ../r1-ws.patch - applying ../r1-ws.patch - - $ cd .. |