mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
66bd74e558
Test Plan: run-tests-.py Reviewers: mitrandir, #mercurial Reviewed By: mitrandir Subscribers: ps, terrelln Differential Revision: https://phabricator.intern.facebook.com/D6675896 Tasks: T24908724 Signature: 6675896:1515448382:df8d80cd7356ae8f5fb04586dc4a0a651bc498fd
140 lines
3.5 KiB
Perl
140 lines
3.5 KiB
Perl
Load commonly used test logic
|
|
$ . "$TESTDIR/hggit/testutil"
|
|
|
|
$ git init gitrepo
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
|
|
$ cd gitrepo
|
|
$ echo alpha > alpha
|
|
$ git add alpha
|
|
$ fn_git_commit -m "add alpha"
|
|
$ git branch alpha
|
|
$ git show-ref
|
|
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha
|
|
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master
|
|
|
|
$ cd ..
|
|
$ hg clone gitrepo hgrepo | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd hgrepo
|
|
$ hg update -q master
|
|
$ echo beta > beta
|
|
$ hg add beta
|
|
$ fn_hg_commit -m 'add beta'
|
|
|
|
|
|
$ echo gamma > gamma
|
|
$ hg add gamma
|
|
$ fn_hg_commit -m 'add gamma'
|
|
|
|
$ hg book -r 1 beta
|
|
|
|
$ hg outgoing | grep -v 'searching for changes'
|
|
comparing with */gitrepo (glob)
|
|
changeset: 1:47580592d3d6
|
|
bookmark: beta
|
|
user: test
|
|
date: Mon Jan 01 00:00:11 2007 +0000
|
|
summary: add beta
|
|
|
|
changeset: 2:953796e1cfd8
|
|
bookmark: master
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 01 00:00:12 2007 +0000
|
|
summary: add gamma
|
|
|
|
$ hg outgoing -r beta | grep -v 'searching for changes'
|
|
comparing with */gitrepo (glob)
|
|
changeset: 1:47580592d3d6
|
|
bookmark: beta
|
|
user: test
|
|
date: Mon Jan 01 00:00:11 2007 +0000
|
|
summary: add beta
|
|
|
|
$ hg outgoing -r master | grep -v 'searching for changes'
|
|
comparing with */gitrepo (glob)
|
|
changeset: 1:47580592d3d6
|
|
bookmark: beta
|
|
user: test
|
|
date: Mon Jan 01 00:00:11 2007 +0000
|
|
summary: add beta
|
|
|
|
changeset: 2:953796e1cfd8
|
|
bookmark: master
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 01 00:00:12 2007 +0000
|
|
summary: add gamma
|
|
|
|
|
|
$ cd ..
|
|
|
|
some more work on master from git
|
|
$ cd gitrepo
|
|
|
|
Check state of refs after outgoing
|
|
$ git show-ref
|
|
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha
|
|
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master
|
|
|
|
$ git checkout master
|
|
Already on 'master'
|
|
$ echo delta > delta
|
|
$ git add delta
|
|
$ fn_git_commit -m "add delta"
|
|
|
|
$ cd ..
|
|
|
|
$ cd hgrepo
|
|
this will fail # maybe we should try to make it work
|
|
$ hg outgoing
|
|
comparing with */gitrepo (glob)
|
|
abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
|
|
[255]
|
|
let's pull and try again
|
|
$ hg pull 2>&1 | grep -v 'divergent bookmark'
|
|
pulling from */gitrepo (glob)
|
|
importing git objects into hg
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg outgoing | grep -v 'searching for changes'
|
|
comparing with */gitrepo (glob)
|
|
changeset: 1:47580592d3d6
|
|
bookmark: beta
|
|
user: test
|
|
date: Mon Jan 01 00:00:11 2007 +0000
|
|
summary: add beta
|
|
|
|
changeset: 2:953796e1cfd8
|
|
bookmark: master
|
|
user: test
|
|
date: Mon Jan 01 00:00:12 2007 +0000
|
|
summary: add gamma
|
|
|
|
$ hg outgoing -r beta | grep -v 'searching for changes'
|
|
comparing with */gitrepo (glob)
|
|
changeset: 1:47580592d3d6
|
|
bookmark: beta
|
|
user: test
|
|
date: Mon Jan 01 00:00:11 2007 +0000
|
|
summary: add beta
|
|
|
|
$ hg outgoing -r master | grep -v 'searching for changes'
|
|
comparing with */gitrepo (glob)
|
|
changeset: 1:47580592d3d6
|
|
bookmark: beta
|
|
user: test
|
|
date: Mon Jan 01 00:00:11 2007 +0000
|
|
summary: add beta
|
|
|
|
changeset: 2:953796e1cfd8
|
|
bookmark: master
|
|
user: test
|
|
date: Mon Jan 01 00:00:12 2007 +0000
|
|
summary: add gamma
|
|
|
|
|
|
|
|
$ cd ..
|