mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
54 lines
1.8 KiB
Plaintext
54 lines
1.8 KiB
Plaintext
Initialized empty Git repository in gitrepo/.git/
|
|
|
|
Switched to a new branch "not-master"
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
pushing to git://localhost/gitrepo
|
|
exporting hg objects to 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
|
|
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
|
|
creating and sending data
|
|
abort: refs/heads/master changed on the server, please pull and merge before pushing
|
|
pulling from git://localhost/gitrepo
|
|
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
|
|
creating and sending data
|
|
abort: pushing refs/heads/master overwrites 72f56395749d
|
|
% ... but succeed with -f
|
|
pushing to git://localhost/gitrepo
|
|
creating and sending data
|
|
default::refs/heads/beta => GIT:cffa0e8d
|
|
default::refs/heads/not-master => GIT:7eeab2ea
|
|
default::refs/heads/master => GIT:cc119202
|