Mercurial > hg > hg-git
view tests/test-merge.out @ 457:e688147a4936
tests: cope with yet another git output format change
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sat, 21 Apr 2012 12:37:08 -0500 |
parents | 753c89b5c0aa |
children | f7f32bc9107b |
line wrap: on
line source
Initialized empty Git repository in gitrepo/.git/ Switched to a new branch "beta" Switched to branch "master" Merge successful beta | 1 + 1 file changed, 1 insertion(+) create mode 100644 beta Initialized empty Git repository in gitrepo2/ 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 exporting hg objects to 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