view tests/test-octopus.out @ 393:15d362677859

tests: update expectations after message cleanups
author Augie Fackler <durin42@gmail.com>
date Wed, 18 May 2011 08:10:00 -0500
parents 3f0f0c64f81c
children b8eeabb61c7b
line wrap: on
line source

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 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/

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
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