##// END OF EJS Templates
record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

File last commit:

r10051:a02d43ac stable
r11237:feb2a58f stable
Show More
test-convert-hg-svn.out
38 lines | 710 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
% adding an empty revision
% echo hg to svn
scanning source...
sorting...
converting...
1 b
0 emtpy
% svn back to hg should do nothing
scanning source...
sorting...
converting...
% hg back to svn should do nothing
scanning source...
sorting...
converting...