diff options
Diffstat (limited to 'tests/test-import-bypass.t')
| -rw-r--r-- | tests/test-import-bypass.t | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/tests/test-import-bypass.t b/tests/test-import-bypass.t index bbee13b..7413ce2 100644 --- a/tests/test-import-bypass.t +++ b/tests/test-import-bypass.t @@ -16,7 +16,6 @@ Test --bypass with other options $ echo a >> a $ hg branch foo marked working directory as branch foo - (branches are permanent and global, did you want a bookmark?) $ hg ci -Am changea $ hg export . > ../test.diff $ hg up null @@ -62,7 +61,8 @@ Test --user, --date and --message @ 0:07f494440405 test 0 0 - default - adda $ hg rollback - repository tip rolled back to revision 1 (undo import) + repository tip rolled back to revision 1 (undo commit) + working directory now based on revision 0 Test --import-branch @@ -74,7 +74,8 @@ Test --import-branch @ 0:07f494440405 test 0 0 - default - adda $ hg rollback - repository tip rolled back to revision 1 (undo import) + repository tip rolled back to revision 1 (undo commit) + working directory now based on revision 0 Test --strip @@ -96,7 +97,8 @@ Test --strip > EOF applying patch from stdin $ hg rollback - repository tip rolled back to revision 1 (undo import) + repository tip rolled back to revision 1 (undo commit) + working directory now based on revision 0 Test unsupported combinations @@ -109,15 +111,7 @@ Test unsupported combinations Test commit editor - $ cat > ../test.diff <<EOF - > diff -r 07f494440405 -r 4e322f7ce8e3 a - > --- a/a Thu Jan 01 00:00:00 1970 +0000 - > +++ b/a Thu Jan 01 00:00:00 1970 +0000 - > @@ -1,1 +1,2 @@ - > -a - > +b - > +c - > EOF + $ hg diff -c 1 > ../test.diff $ HGEDITOR=cat hg import --bypass ../test.diff applying ../test.diff @@ -144,7 +138,7 @@ Test patch.eol is handled $ hg --config patch.eol=auto import -d '0 0' -m 'test patch.eol' --bypass ../test.diff applying ../test.diff $ shortlog - o 3:c606edafba99 test 0 0 - default - test patch.eol + o 3:d7805b4d2cb3 test 0 0 - default - test patch.eol | @ 2:872023de769d test 0 0 - default - makeacrlf | @@ -180,6 +174,7 @@ Test applying multiple patches $ hg import --bypass ../patch1.diff ../patch2.diff applying ../patch1.diff applying ../patch2.diff + applied 16581080145e $ shortlog o 3:bc8ca3f8a7c4 test 0 0 - default - addf | @@ -204,6 +199,7 @@ Test applying multiple patches with --exact $ hg import --bypass --exact ../patch1.diff ../patch2.diff applying ../patch1.diff applying ../patch2.diff + applied 16581080145e $ shortlog o 3:d60cb8989666 test 0 0 - foo - addf | @@ -216,8 +212,6 @@ Test applying multiple patches with --exact $ cd .. -#if symlink execbit - Test complicated patch with --exact $ hg init repo-exact @@ -265,6 +259,3 @@ data. If not, diff both heads to debug it. | o 0:a0e19e636a43 test 0 0 - default - t -#endif - - $ cd .. |