Mercurial > hg
view tests/test-convert-hg-svn.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Wed, 04 Mar 2009 13:06:16 -0600 |
| 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...