Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-convert-git.out @ 5347:9c0f864fddca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 30 Sep 2007 12:36:11 +0200
parents 24de027551c1 9f35d0bcf00e
children a5a7f7fd5554
comparison
equal deleted inserted replaced
5344:cc34be74eeec 5347:9c0f864fddca
1 rm 'd/b'
1 assuming destination git-repo-hg 2 assuming destination git-repo-hg
2 initializing destination git-repo-hg repository 3 initializing destination git-repo-hg repository
3 scanning source... 4 scanning source...
4 sorting... 5 sorting...
5 converting... 6 converting...
6 3 t1 7 5 t1
7 2 t2.1 8 4 t2
8 1 t2.2 9 3 t3
10 2 t4.1
11 1 t4.2
9 0 Merge branch other 12 0 Merge branch other
10 changeset: 3:69b3a302b4a1 13 changeset: 5:c6d72c98aa00
11 tag: tip 14 tag: tip
12 parent: 1:0de2a40e261b 15 parent: 3:a18bdfccf429
13 parent: 2:8815d3b33506 16 parent: 4:48cb5b72ce56
14 user: test <test@example.org> 17 user: test <test@example.org>
15 date: Mon Jan 01 00:00:13 2007 +0000 18 date: Mon Jan 01 00:00:15 2007 +0000
16 files: a 19 files: a
17 description: 20 description:
18 Merge branch other 21 Merge branch other
19 22
20 committer: test <test@example.org> 23 committer: test <test@example.org>