Mercurial > hg-stable
view tests/test-convert-hg-svn.out @ 6672:6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 12 Jun 2008 02:27:06 +0200 |
parents | 0750f11152fe |
children | ea26ac58bbe3 |
line wrap: on
line source
Checked out revision 0. A a Adding a Transmitting file data . Committed revision 1. % initial roundtrip scanning source... sorting... converting... 0 added a scanning source... sorting... converting... % second roundtrip should do nothing scanning source... sorting... converting... scanning source... sorting... converting... % new hg rev updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % echo hg to svn scanning source... sorting... converting... 0 b % svn back to hg should do nothing scanning source... sorting... converting... % hg back to svn should do nothing scanning source... sorting... converting...