mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
c0ec4f8882
This test was being skipped in Mercurial < 1.5. We don't support Mercurial that old any more, so there isn't a need to worry about it in the tests.
97 lines
2.8 KiB
Raku
Executable File
97 lines
2.8 KiB
Raku
Executable File
Load commonly used test logic
|
|
$ . "$TESTDIR/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 tag alpha
|
|
|
|
$ git checkout -b beta 2>&1 | sed s/\'/\"/g
|
|
Switched to a new branch "beta"
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
|
|
$ cd ..
|
|
clone a tag
|
|
$ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
|
|
importing git objects into hg
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo-a log --graph | egrep -v ': *(beta|master)'
|
|
@ changeset: 0:3442585be8a6
|
|
tag: alpha
|
|
tag: default/master
|
|
tag: tip
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
clone a branch
|
|
$ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating'
|
|
importing git objects into hg
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg -R hgrepo-b log --graph | egrep -v ': *(beta|master)'
|
|
@ changeset: 1:7bcd915dc873
|
|
| tag: default/beta
|
|
| tag: tip
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
o changeset: 0:3442585be8a6
|
|
tag: alpha
|
|
tag: default/master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
$ cd gitrepo
|
|
$ echo beta line 2 >> beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add to beta'
|
|
|
|
$ cd ..
|
|
$ cd hgrepo-b
|
|
$ hg strip tip 2>&1 | grep -v saving | grep -v backup
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg pull -r beta
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
abort: you appear to have run strip - please run hg git-cleanup
|
|
[255]
|
|
$ hg git-cleanup
|
|
git commit map cleaned
|
|
pull works after 'hg git-cleanup'
|
|
"adding remote bookmark" message was added in Mercurial 2.3
|
|
$ hg pull -r beta | grep -v "adding remote bookmark"
|
|
pulling from $TESTTMP/gitrepo
|
|
importing git objects into hg
|
|
(run 'hg update' to get a working copy)
|
|
$ hg log --graph | egrep -v 'bookmark: *(alpha|beta|master)'
|
|
o changeset: 2:611948b1ec6a
|
|
| tag: default/beta
|
|
| tag: tip
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
| summary: add to beta
|
|
|
|
|
o changeset: 1:7bcd915dc873
|
|
| user: test <test@example.org>
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
| summary: add beta
|
|
|
|
|
@ changeset: 0:3442585be8a6
|
|
tag: alpha
|
|
tag: default/master
|
|
user: test <test@example.org>
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
summary: add alpha
|
|
|
|
|
|
$ cd ..
|