comparison tests/test-keyword.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 77325c92db95
children e0348815e806 41885892796e
comparison
equal deleted inserted replaced
15197:7f65ce5cc011 15198:62dc0e7ab092
823 xxx $ 823 xxx $
824 $Xinfo: User Name <user@example.com>: rejects? $ 824 $Xinfo: User Name <user@example.com>: rejects? $
825 ignore $Id$ 825 ignore $Id$
826 826
827 $ hg rollback 827 $ hg rollback
828 repository tip rolled back to revision 2 (undo commit) 828 repository tip rolled back to revision 2 (undo import)
829 working directory now based on revision 2 829 working directory now based on revision 2
830 $ hg update --clean 830 $ hg update --clean
831 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 831 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
832 832
833 kwexpand/kwshrink on selected files 833 kwexpand/kwshrink on selected files