##// END OF EJS Templates
mq: qpop: remove added files before re-adding removed files...
mq: qpop: remove added files before re-adding removed files We need to do this to avoid file/directories conflicts. This causes patches removing a committed file and replacing it with a directory to be "unpoppable".

File last commit:

r9816:ea26ac58 default
r10048:46de82e5 stable
Show More
test-convert-hg-svn.out
36 lines | 675 B | text/plain | TextLexer
/ tests / test-convert-hg-svn.out
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 to branch default
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...