mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
479bebaa1f
These test changes should make it easier to see what's still broken in 1.8 and 1.9. Ideally, we'll drop pre-1.8 versions soon and rip most of this out, but I'm not sure how realistic that is in the short term.
65 lines
2.2 KiB
Plaintext
65 lines
2.2 KiB
Plaintext
Initialized empty Git repository in gitrepo/.git/
|
|
|
|
Switched to a new branch "not-master"
|
|
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
|
|
pushing to git://localhost/gitrepo
|
|
importing Hg objects into Git
|
|
creating and sending data
|
|
default::refs/heads/beta => GIT:cffa0e8d
|
|
default::refs/heads/not-master => GIT:7eeab2ea
|
|
default::refs/heads/master => GIT:7eeab2ea
|
|
% should have two different branches
|
|
beta cffa0e8 add beta
|
|
master 7eeab2e add alpha
|
|
* not-master 7eeab2e add alpha
|
|
% some more work on master from git
|
|
Switched to branch "master"
|
|
Switched to branch "not-master"
|
|
% this should fail
|
|
pushing to git://localhost/gitrepo
|
|
importing Hg objects into Git
|
|
creating and sending data
|
|
abort: refs/heads/master changed on the server, please pull and merge before pushing
|
|
% ... even with -f
|
|
pushing to git://localhost/gitrepo
|
|
importing Hg objects into Git
|
|
creating and sending data
|
|
abort: refs/heads/master changed on the server, please pull and merge before pushing
|
|
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)
|
|
% master and default/master should be diferent
|
|
changeset: 2:72f56395749d
|
|
user: test
|
|
date: Mon Jan 01 00:00:12 2007 +0000
|
|
summary: add gamma
|
|
|
|
changeset: 3:1436150b86c2
|
|
tag: default/master
|
|
tag: tip
|
|
parent: 0:3442585be8a6
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:13 2007 +0000
|
|
summary: add delta
|
|
|
|
% this should also fail
|
|
pushing to git://localhost/gitrepo
|
|
importing Hg objects into Git
|
|
creating and sending data
|
|
abort: pushing refs/heads/master overwrites 72f56395749d
|
|
% ... but succeed with -f
|
|
pushing to git://localhost/gitrepo
|
|
importing Hg objects into Git
|
|
creating and sending data
|
|
default::refs/heads/beta => GIT:cffa0e8d
|
|
default::refs/heads/not-master => GIT:7eeab2ea
|
|
default::refs/heads/master => GIT:cc119202
|