mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
91561c5a2e
also use ObjectStore.tree_changes from dulwich instead of our own func (the change to test octopus is legitimate, there were some duplicate entries)
101 lines
3.3 KiB
Plaintext
101 lines
3.3 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 9497a4ee62e16ee641860d7677cdb2589ea15554
|
|
Trying simple merge with e5023f9e5cb24fdcec7b6c127cec45d8888e35a9
|
|
Merge made by octopus.
|
|
beta | 1 +
|
|
gamma | 1 +
|
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
|
create mode 100644 beta
|
|
create mode 100644 gamma
|
|
Initialized empty Git repository in gitrepo2/.git/
|
|
|
|
importing Hg objects into Git
|
|
Counting objects: 14, done.
|
|
Compressing objects: 11% (1/9)
|
|
Compressing objects: 22% (2/9)
|
|
Compressing objects: 33% (3/9)
|
|
Compressing objects: 44% (4/9)
|
|
Compressing objects: 55% (5/9)
|
|
Compressing objects: 66% (6/9)
|
|
Compressing objects: 77% (7/9)
|
|
Compressing objects: 88% (8/9)
|
|
Compressing objects: 100% (9/9)
|
|
Compressing objects: 100% (9/9), done.
|
|
Total 14 (delta 3), reused 0 (delta 0)
|
|
importing Git objects into Hg
|
|
at: 0/5
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
@ changeset: 5:6523aa9f4775
|
|
|\ tag: master
|
|
| | tag: default/master
|
|
| | tag: tip
|
|
| | parent: 1:1436150b86c2
|
|
| | parent: 4:7f6c791a169f
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:13 2007 +0000
|
|
| | summary: Merge branches 'branch1' and 'branch2'
|
|
| |
|
|
| o changeset: 4:7f6c791a169f
|
|
| |\ parent: 2:7bcd915dc873
|
|
| | | parent: 3:37c124f2d0a0
|
|
| | | user: test <test@example.org>
|
|
| | | date: Mon Jan 01 00:00:13 2007 +0000
|
|
| | | summary: Merge branches 'branch1' and 'branch2'
|
|
| | |
|
|
| | o changeset: 3:37c124f2d0a0
|
|
| | | tag: branch2
|
|
| | | tag: default/branch2
|
|
| | | parent: 0:3442585be8a6
|
|
| | | user: test <test@example.org>
|
|
| | | date: Mon Jan 01 00:00:12 2007 +0000
|
|
| | | summary: add gamma
|
|
| | |
|
|
| o | changeset: 2:7bcd915dc873
|
|
| |/ tag: branch1
|
|
| | tag: default/branch1
|
|
| | parent: 0:3442585be8a6
|
|
| | user: test <test@example.org>
|
|
| | date: Mon Jan 01 00:00:11 2007 +0000
|
|
| | summary: add beta
|
|
| |
|
|
o | changeset: 1:1436150b86c2
|
|
|/ user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:13 2007 +0000
|
|
| summary: add delta
|
|
|
|
|
o changeset: 0:3442585be8a6
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
clearing out the git cache data
|
|
pushing to git://localhost/gitrepo2
|
|
importing Hg objects into Git
|
|
at: 0/6
|
|
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
|