tests/test-convert-git.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 24 Sep 2007 19:00:11 -0300
changeset 5335 88e931f74e8b
parent 5231 5c2ca6d6ab21
child 5336 24de027551c1
child 5345 9f35d0bcf00e
permissions -rw-r--r--
convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.

assuming destination git-repo-hg
initializing destination git-repo-hg repository
scanning source...
sorting...
converting...
3 t1
2 t2.1
1 t2.2
0 Merge branch other
changeset:   3:f0873470732d
tag:         tip
parent:      1:cb991dbbb06b
parent:      2:600bef931ca4
user:        test <test@example.org>
date:        Mon Jan 01 00:00:13 2007 +0000
files:       a
description:
Merge branch other

committer: test <test@example.org>