sapling/tests/test-merge.out

58 lines
1.8 KiB
Plaintext

Initialized empty Git repository in gitrepo/.git/
Switched to a new branch "beta"
Switched to branch "master"
Merge made by recursive.
beta | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 beta
Initialized empty Git repository in gitrepo2/
importing Hg objects into Git
Counting objects: 11, done.
Compressing objects: 14% (1/7)
Compressing objects: 28% (2/7)
Compressing objects: 42% (3/7)
Compressing objects: 57% (4/7)
Compressing objects: 71% (5/7)
Compressing objects: 85% (6/7)
Compressing objects: 100% (7/7)
Compressing objects: 100% (7/7), done.
Total 11 (delta 3), reused 0 (delta 0)
importing Git objects into Hg
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% clear the cache to be sure it is regenerated correctly
clearing out the git cache data
pushing to git://localhost/gitrepo2
importing Hg objects into Git
creating and sending data
% git log in repo pushed from hg
commit 5806851511aaf3bfe813ae3a86c5027165fa9b96
Merge: e5023f9 9497a4e
Author: test <test@example.org>
Date: Mon Jan 1 00:00:12 2007 +0000
Merge branch 'beta'
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
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