Mercurial > public > mercurial-scm > hg
diff tests/test-import-bypass.t @ 15198:62dc0e7ab092
import: wrap a transaction around the whole command
Now 'rollback' after 'import' is less surprising: it rolls back all of
the imported changesets, not just the last one. As an extra added
benefit, you don't need 'rollback -f' after 'import --bypass', which
was an undesired side effect of fixing issue2998 (59e8bc22506e)..
Note that this is a different take on issue963, which complained that
rollback after importing multiple patches returned the working dir
parent to the starting point, not to the second-last patch applied.
Since we now rollback the entire import, returning the working dir to
the starting point is entirely logical. So this change also undoes
a732eebf1958, the fix to issue963, and updates its tests accordingly.
Bottom line: rollback after import was weird before issue963,
understandable since the fix for issue963, and even better now.
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sun, 02 Oct 2011 14:34:28 -0400 |
| parents | 0705f2ac79d6 |
| children | e0348815e806 41885892796e |
line wrap: on
line diff
--- a/tests/test-import-bypass.t Sat Oct 01 21:52:44 2011 -0400 +++ b/tests/test-import-bypass.t Sun Oct 02 14:34:28 2011 -0400 @@ -60,8 +60,8 @@ |/ @ 0:07f494440405 test 0 0 - default - adda - $ hg rollback -f - repository tip rolled back to revision 1 (undo commit) + $ hg rollback + repository tip rolled back to revision 1 (undo import) Test --import-branch @@ -72,8 +72,8 @@ | @ 0:07f494440405 test 0 0 - default - adda - $ hg rollback -f - repository tip rolled back to revision 1 (undo commit) + $ hg rollback + repository tip rolled back to revision 1 (undo import) Test --strip @@ -94,8 +94,8 @@ > +a > EOF applying patch from stdin - $ hg rollback -f - repository tip rolled back to revision 1 (undo commit) + $ hg rollback + repository tip rolled back to revision 1 (undo import) Test unsupported combinations