Mercurial > hg
view tests/test-convert-darcs.out @ 9526:457a30ed8ffb
convert/darcs: fix file renaming (issue1853)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 04 Oct 2009 22:23:11 +0200 |
parents | 2299c421a98e |
children | b3c13e721593 |
line wrap: on
line source
% initialize darcs repo Finished recording patch 'p0' % branch and update Finished recording patch 'p1.1' % update source Finished recording patch 'p1.2' % merge branch Backing up ./a(-darcs-backup0) We have conflicts in the following files: ./a Finished pulling and applying. Finished recording patch 'p2' % test file and directory move Finished recording patch 'p3' initializing destination darcs-repo-hg repository scanning source... sorting... converting... 4 p0 3 p1.2 2 p1.1 1 p2 0 p3 o 4 "p3" files: f ff | o 3 "p2" files: a f | o 2 "p1.1" files: | o 1 "p1.2" files: a b | o 0 "p0" files: a 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a 1e88685f5ddec574a34c70af492f95b6debc8741 644 b ef5c76581d78340f568d5f48d679bf307452cbc9 644 ff