Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-convert-git.out @ 5336:24de027551c1
Merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Sep 2007 19:14:18 -0300 |
parents | 88e931f74e8b |
children | 9c0f864fddca |
rev | line source |
---|---|
5231
ceb6f242fb81
Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 assuming destination git-repo-hg |
ceb6f242fb81
Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 initializing destination git-repo-hg repository |
ceb6f242fb81
Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 scanning source... |
ceb6f242fb81
Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 sorting... |
ceb6f242fb81
Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 converting... |
5335
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
6 3 t1 |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
7 2 t2.1 |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
8 1 t2.2 |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
9 0 Merge branch other |
5336
24de027551c1
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5335
diff
changeset
|
10 changeset: 3:69b3a302b4a1 |
5335
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
11 tag: tip |
5336
24de027551c1
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5335
diff
changeset
|
12 parent: 1:0de2a40e261b |
24de027551c1
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5335
diff
changeset
|
13 parent: 2:8815d3b33506 |
5335
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
14 user: test <test@example.org> |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
15 date: Mon Jan 01 00:00:13 2007 +0000 |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
16 files: a |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
17 description: |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
18 Merge branch other |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
19 |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
20 committer: test <test@example.org> |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
21 |
88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5271
diff
changeset
|
22 |