Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
5334:448eb46d4d84 | 5335:88e931f74e8b |
---|---|
1 assuming destination git-repo-hg | 1 assuming destination git-repo-hg |
2 initializing destination git-repo-hg repository | 2 initializing destination git-repo-hg repository |
3 scanning source... | 3 scanning source... |
4 sorting... | 4 sorting... |
5 converting... | 5 converting... |
6 1 t1 | 6 3 t1 |
7 0 t2 | 7 2 t2.1 |
8 1 t2.2 | |
9 0 Merge branch other | |
10 changeset: 3:f0873470732d | |
11 tag: tip | |
12 parent: 1:cb991dbbb06b | |
13 parent: 2:600bef931ca4 | |
14 user: test <test@example.org> | |
15 date: Mon Jan 01 00:00:13 2007 +0000 | |
16 files: a | |
17 description: | |
18 Merge branch other | |
19 | |
20 committer: test <test@example.org> | |
21 | |
22 |