Mercurial Mercurial > mercurial / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-convert-svn-source.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 7074 b1a4f67b98d0
permissions -rw-r--r--
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

# now tests that it works with trunk/tags layout, but no branches yet

% initial svn import
Adding         projB/trunk
Adding         projB/tags

Committed revision 1.
% update svn repository
Checked out revision 1.
A         letter .txt
Adding         letter .txt
Transmitting file data .
Committed revision 2.
Sending        letter .txt
Transmitting file data .
Committed revision 3.

Committed revision 4.
Sending        letter .txt
Transmitting file data .
Committed revision 5.
% convert to hg once
initializing destination B-hg repository
scanning source...
sorting...
converting...
3 init projB
2 hello
1 world
0 nice day
updating tags
% update svn repository again
A         letter2.txt
Sending        letter .txt
Adding         letter2.txt
Transmitting file data ..
Committed revision 6.

Committed revision 7.
Sending        letter2.txt
Transmitting file data .
Committed revision 8.
% test incremental conversion
scanning source...
sorting...
converting...
1 second letter
0 work in progress
updating tags
o  7 update tags files: .hgtags
|
o  6 work in progress files: letter2.txt
|
o  5 second letter files: letter .txt letter2.txt
|
o  4 update tags files: .hgtags
|
o  3 nice day files: letter .txt
|
o  2 world files: letter .txt
|
o  1 hello files: letter .txt
|
o  0 init projB files:

tip
v0.2
v0.1
% test filemap
initializing destination fmap repository
scanning source...
sorting...
converting...
5 init projB
4 hello
3 world
2 nice day
1 second letter
0 work in progress
o  1 work in progress files: letter2.txt
|
o  0 second letter files: letter2.txt

% test stop revision
initializing destination stoprev repository
scanning source...
sorting...
converting...
0 init projB
extra:       branch=
extra:       convert_revision=
mercurial