1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
Load commonly used test logic
$ . "$TESTDIR/testutil"
$ hg init hgrepo1
$ cd hgrepo1
$ echo A > afile
$ hg add afile
$ hg ci -m "origin"
$ echo B > afile
$ hg ci -m "A->B"
$ echo C > afile
$ hg ci -m "B->C"
$ hg up -r0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo C > afile
$ hg ci -m "A->C"
created new head
$ hg merge -r2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge"
$ hg log --graph --style compact | sed 's/\[.*\]//g'
@ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test
|\ merge
| |
| o 3:0 ea82b67264a1 1970-01-01 00:00 +0000 test
| | A->C
| |
o | 2 0dbe4ac1a758 1970-01-01 00:00 +0000 test
| | B->C
| |
o | 1 7205e83b5a3f 1970-01-01 00:00 +0000 test
|/ A->B
|
o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
origin
$ cd ..
$ git init -q --bare repo.git
$ cd hgrepo1
$ hg bookmark -r4 master
$ hg push -r master ../repo.git
pushing to ../repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 5 commits with 3 trees and 3 blobs
adding reference refs/heads/master
$ cd ..
$ hg clone repo.git hgrepo2
importing 5 git commits
new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts)
updating to bookmark master
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
expect the same revision ids as above
$ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g'
@ 4:1,3 eaa21d002113 1970-01-01 00:00 +0000 test
|\ merge
| |
| o 3 0dbe4ac1a758 1970-01-01 00:00 +0000 test
| | B->C
| |
| o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test
| | A->B
| |
o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test
|/ A->C
|
o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
origin
$ hg -R hgrepo2 gverify
verifying rev eaa21d002113 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0
|
