sapling/tests/test-outgoing.out

96 lines
2.5 KiB
Plaintext

Initialized empty Git repository in gitrepo/.git/
importing Hg objects into Git
Counting objects: 3, done.
Total 3 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
comparing with git://localhost/gitrepo
importing Hg objects into Git
changeset: 1:0564f526fb0f
tag: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:72f56395749d
tag: master
tag: tip
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
comparing with git://localhost/gitrepo
importing Hg objects into Git
changeset: 1:0564f526fb0f
tag: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
comparing with git://localhost/gitrepo
importing Hg objects into Git
changeset: 1:0564f526fb0f
tag: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:72f56395749d
tag: master
tag: tip
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
% some more work on master from git
Already on "master"
% this will fail
comparing with git://localhost/gitrepo
importing Hg objects into Git
abort: refs/heads/master changed on the server, please pull and merge before pushing
% let's pull and try again
pulling from git://localhost/gitrepo
importing Hg objects into Git
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Total 3 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
(run 'hg update' to get a working copy)
comparing with git://localhost/gitrepo
importing Hg objects into Git
changeset: 1:0564f526fb0f
tag: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:72f56395749d
tag: master
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
comparing with git://localhost/gitrepo
importing Hg objects into Git
changeset: 1:0564f526fb0f
tag: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
comparing with git://localhost/gitrepo
importing Hg objects into Git
changeset: 1:0564f526fb0f
tag: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:72f56395749d
tag: master
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma