File: test-merge.out

package info (click to toggle)
hg-git 0.3.2-2
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 484 kB
  • sloc: python: 1,974; sh: 1,265; makefile: 36
file content (53 lines) | stat: -rw-r--r-- 1,409 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
Initialized empty Git repository in gitrepo/.git/

Switched to a new branch "beta"
Switched to branch "master"
Merge successful
 beta |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 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