mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
70 lines
1.8 KiB
Plaintext
70 lines
1.8 KiB
Plaintext
Initialized empty Git repository in gitrepo/.git/
|
|
|
|
Switched to a new branch "branch1"
|
|
Switched to a new branch "branch2"
|
|
Switched to branch "master"
|
|
Trying simple merge with branch1
|
|
Trying simple merge with branch2
|
|
Merge successful
|
|
beta | 1 +
|
|
gamma | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 beta
|
|
create mode 100644 gamma
|
|
Initialized empty Git repository in gitrepo2/
|
|
|
|
importing git objects into hg
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
@ 5:3,4 6523aa9f4775 2007-01-01 00:00 +0000 test
|
|
|\ Merge branches 'branch1' and 'branch2'
|
|
| |
|
|
| o 4:1,2 7f6c791a169f 2007-01-01 00:00 +0000 test
|
|
| |\ Merge branches 'branch1' and 'branch2'
|
|
| | |
|
|
o | | 3:0 1436150b86c2 2007-01-01 00:00 +0000 test
|
|
| | | add delta
|
|
| | |
|
|
+---o 2:0 37c124f2d0a0 2007-01-01 00:00 +0000 test
|
|
| | add gamma
|
|
| |
|
|
| o 1 7bcd915dc873 2007-01-01 00:00 +0000 test
|
|
|/ add beta
|
|
|
|
|
o 0 3442585be8a6 2007-01-01 00:00 +0000 test
|
|
add alpha
|
|
|
|
clearing out the git cache data
|
|
pushing to git://localhost/gitrepo2
|
|
exporting hg objects to git
|
|
creating and sending data
|
|
commit f0c7ec180419a130636d0c333fc34c1462cab4b5
|
|
Merge: d8e22dd 9497a4e e5023f9
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:13 2007 +0000
|
|
|
|
Merge branches 'branch1' and 'branch2'
|
|
|
|
commit d8e22ddb015d06460ccbb4508d2184c12c8a7c4c
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:13 2007 +0000
|
|
|
|
add delta
|
|
|
|
commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
add gamma
|
|
|
|
commit 9497a4ee62e16ee641860d7677cdb2589ea15554
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:11 2007 +0000
|
|
|
|
add beta
|
|
|
|
commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:10 2007 +0000
|
|
|
|
add alpha
|