2009-06-29 01:00:46 +04:00
|
|
|
Initialized empty Git repository in gitrepo/.git/
|
|
|
|
|
|
|
|
Switched to a new branch "beta"
|
|
|
|
Switched to branch "master"
|
2011-10-09 22:39:37 +04:00
|
|
|
Merge successful
|
2012-08-01 02:08:37 +04:00
|
|
|
beta | 1 +
|
2012-04-21 21:37:08 +04:00
|
|
|
1 file changed, 1 insertion(+)
|
2009-06-29 01:00:46 +04:00
|
|
|
create mode 100644 beta
|
2010-03-26 03:54:00 +03:00
|
|
|
Initialized empty Git repository in gitrepo2/
|
2009-06-29 01:00:46 +04:00
|
|
|
|
2011-05-18 17:10:00 +04:00
|
|
|
importing git objects into hg
|
2009-06-29 01:00:46 +04:00
|
|
|
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
|
2011-05-18 17:10:00 +04:00
|
|
|
exporting hg objects to git
|
2009-06-29 01:00:46 +04:00
|
|
|
creating and sending data
|
2009-12-26 21:22:06 +03:00
|
|
|
% git log in repo pushed from hg
|
2009-06-29 01:00:46 +04:00
|
|
|
commit 5806851511aaf3bfe813ae3a86c5027165fa9b96
|
2009-08-11 08:13:37 +04:00
|
|
|
Merge: e5023f9 9497a4e
|
2009-06-29 01:00:46 +04:00
|
|
|
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
|