2012-10-31 04:03:26 +04:00
|
|
|
Load commonly used test logic
|
2018-01-09 17:08:01 +03:00
|
|
|
$ . "$TESTDIR/hggit/testutil"
|
2012-10-31 04:03:26 +04:00
|
|
|
|
2012-10-31 08:01:03 +04:00
|
|
|
$ git init gitrepo
|
2012-09-14 04:49:42 +04:00
|
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
|
2012-10-31 08:01:03 +04:00
|
|
|
$ cd gitrepo
|
2012-09-10 08:27:44 +04:00
|
|
|
$ echo alpha > alpha
|
|
|
|
$ git add alpha
|
2012-10-31 06:59:20 +04:00
|
|
|
$ fn_git_commit -m 'add alpha'
|
2012-09-10 08:27:44 +04:00
|
|
|
|
|
|
|
$ git tag alpha
|
|
|
|
|
2018-01-09 16:53:20 +03:00
|
|
|
$ git checkout -b beta
|
|
|
|
Switched to a new branch 'beta'
|
2012-09-10 08:27:44 +04:00
|
|
|
$ echo beta > beta
|
|
|
|
$ git add beta
|
2012-10-31 06:59:20 +04:00
|
|
|
$ fn_git_commit -m 'add beta'
|
2012-09-10 08:27:44 +04:00
|
|
|
|
|
|
|
|
|
|
|
$ cd ..
|
2012-11-04 03:14:17 +04:00
|
|
|
clone a tag
|
2012-09-14 04:49:45 +04:00
|
|
|
$ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
|
2012-09-10 08:27:44 +04:00
|
|
|
importing git objects into hg
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2015-03-12 20:29:58 +03:00
|
|
|
$ hg -R hgrepo-a log --graph
|
2018-12-06 23:00:57 +03:00
|
|
|
@ changeset: 0:69982ec78c6d
|
2015-03-12 20:29:58 +03:00
|
|
|
bookmark: master
|
2012-09-10 08:27:44 +04:00
|
|
|
tag: alpha
|
|
|
|
tag: default/master
|
|
|
|
tag: tip
|
|
|
|
user: test <test@example.org>
|
|
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
|
|
summary: add alpha
|
|
|
|
|
2012-11-04 03:14:17 +04:00
|
|
|
clone a branch
|
2012-09-14 04:49:45 +04:00
|
|
|
$ hg clone -r beta gitrepo hgrepo-b | grep -v '^updating'
|
2012-09-10 08:27:44 +04:00
|
|
|
importing git objects into hg
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2015-03-12 20:29:58 +03:00
|
|
|
$ hg -R hgrepo-b log --graph
|
2018-12-06 23:00:57 +03:00
|
|
|
@ changeset: 1:3bb02b6794dd
|
2015-03-12 20:29:58 +03:00
|
|
|
| bookmark: beta
|
2012-09-10 08:27:44 +04:00
|
|
|
| tag: default/beta
|
|
|
|
| tag: tip
|
|
|
|
| user: test <test@example.org>
|
|
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
|
|
| summary: add beta
|
|
|
|
|
|
2018-12-06 23:00:57 +03:00
|
|
|
o changeset: 0:69982ec78c6d
|
2015-03-12 20:29:58 +03:00
|
|
|
bookmark: master
|
2012-09-10 08:27:44 +04:00
|
|
|
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
|
2012-10-31 06:59:20 +04:00
|
|
|
$ fn_git_commit -m 'add to beta'
|
2012-09-10 08:27:44 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ cd hgrepo-b
|
2019-02-25 14:50:46 +03:00
|
|
|
$ hg debugstrip tip 2>&1 | grep -v saving | grep -v backup
|
2012-09-10 08:27:44 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg pull -r beta
|
2012-09-14 04:49:45 +04:00
|
|
|
pulling from $TESTTMP/gitrepo
|
2012-09-10 08:27:44 +04:00
|
|
|
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
|
2012-11-04 03:14:17 +04:00
|
|
|
pull works after 'hg git-cleanup'
|
2012-10-26 04:49:08 +04:00
|
|
|
"adding remote bookmark" message was added in Mercurial 2.3
|
|
|
|
$ hg pull -r beta | grep -v "adding remote bookmark"
|
2012-09-14 04:49:45 +04:00
|
|
|
pulling from $TESTTMP/gitrepo
|
2012-09-10 08:27:44 +04:00
|
|
|
importing git objects into hg
|
2015-03-12 20:29:58 +03:00
|
|
|
$ hg log --graph
|
2018-12-06 23:00:57 +03:00
|
|
|
o changeset: 2:3db9bf9073b5
|
2015-03-12 20:29:58 +03:00
|
|
|
| bookmark: beta
|
2012-09-10 08:27:44 +04:00
|
|
|
| tag: default/beta
|
|
|
|
| tag: tip
|
|
|
|
| user: test <test@example.org>
|
|
|
|
| date: Mon Jan 01 00:00:12 2007 +0000
|
|
|
|
| summary: add to beta
|
|
|
|
|
|
2018-12-06 23:00:57 +03:00
|
|
|
o changeset: 1:3bb02b6794dd
|
2012-09-10 08:27:44 +04:00
|
|
|
| user: test <test@example.org>
|
|
|
|
| date: Mon Jan 01 00:00:11 2007 +0000
|
|
|
|
| summary: add beta
|
|
|
|
|
|
2018-12-06 23:00:57 +03:00
|
|
|
@ changeset: 0:69982ec78c6d
|
2015-03-12 20:29:58 +03:00
|
|
|
bookmark: master
|
2012-09-10 08:27:44 +04:00
|
|
|
tag: alpha
|
|
|
|
tag: default/master
|
|
|
|
user: test <test@example.org>
|
|
|
|
date: Mon Jan 01 00:00:10 2007 +0000
|
|
|
|
summary: add alpha
|
|
|
|
|
|
|
|
|
|
|
|
$ cd ..
|