view tests/test-convert-hg-svn.out @ 6298:53cbb33e1269

normallookup: during merges, restore the state saved by remove
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 18 Mar 2008 04:07:39 -0300
parents 2147a734dcf9
children 0750f11152fe
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
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...