Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-convert-git.out @ 5335:88e931f74e8b
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Sep 2007 19:00:11 -0300 |
parents | 5c2ca6d6ab21 |
children | 24de027551c1 9f35d0bcf00e |
line wrap: on
line source
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>