2012-10-31 04:03:26 +04:00
|
|
|
Load commonly used test logic
|
|
|
|
$ . "$TESTDIR/testutil"
|
|
|
|
|
2012-09-10 08:26:39 +04:00
|
|
|
$ hg init hgrepo1
|
|
|
|
$ cd hgrepo1
|
|
|
|
$ echo A > afile
|
|
|
|
$ hg add afile
|
|
|
|
$ hg ci -m "origin"
|
|
|
|
|
|
|
|
$ echo B > afile
|
|
|
|
$ hg ci -m "A->B"
|
|
|
|
|
|
|
|
$ hg up -r0
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo C > afile
|
|
|
|
$ hg ci -m "A->C"
|
|
|
|
created new head
|
|
|
|
|
|
|
|
$ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile$' | sed 's/incomplete.*/failed!/'
|
|
|
|
warning: conflicts during merge.
|
|
|
|
merging afile failed!
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
|
|
|
|
resolve using second parent
|
|
|
|
$ echo B > afile
|
|
|
|
$ hg resolve -m afile
|
|
|
|
$ hg ci -m "merge to B"
|
|
|
|
|
|
|
|
$ hg log --graph --style compact | sed 's/\[.*\]//g'
|
|
|
|
@ 3:2,1 120385945d08 1970-01-01 00:00 +0000 test
|
|
|
|
|\ merge to B
|
|
|
|
| |
|
|
|
|
| o 2:0 ea82b67264a1 1970-01-01 00:00 +0000 test
|
|
|
|
| | A->C
|
|
|
|
| |
|
|
|
|
o | 1 7205e83b5a3f 1970-01-01 00:00 +0000 test
|
|
|
|
|/ A->B
|
|
|
|
|
|
|
|
|
o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
|
|
|
|
origin
|
|
|
|
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
2012-10-31 08:01:03 +04:00
|
|
|
$ git init --bare gitrepo
|
2012-09-14 04:49:42 +04:00
|
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/
|
2012-09-10 08:26:39 +04:00
|
|
|
|
|
|
|
$ cd hgrepo1
|
|
|
|
$ hg bookmark -r tip master
|
2012-09-14 04:49:45 +04:00
|
|
|
$ hg push -r master ../gitrepo
|
|
|
|
pushing to ../gitrepo
|
2012-10-08 04:11:27 +04:00
|
|
|
searching for changes
|
2012-09-10 08:26:39 +04:00
|
|
|
$ cd ..
|
|
|
|
|
2012-09-14 04:49:45 +04:00
|
|
|
$ hg clone gitrepo hgrepo2 | grep -v '^updating'
|
2012-09-10 08:26:39 +04:00
|
|
|
importing git objects into hg
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-11-04 03:14:17 +04:00
|
|
|
expect the same revision ids as above
|
2012-11-04 03:12:08 +04:00
|
|
|
$ hg -R hgrepo2 log --graph --style compact | sed 's/\[.*\]//g'
|
2012-09-10 08:26:39 +04:00
|
|
|
@ 3:1,2 120385945d08 1970-01-01 00:00 +0000 test
|
|
|
|
|\ merge to B
|
|
|
|
| |
|
|
|
|
| o 2:0 7205e83b5a3f 1970-01-01 00:00 +0000 test
|
|
|
|
| | A->B
|
|
|
|
| |
|
|
|
|
o | 1 ea82b67264a1 1970-01-01 00:00 +0000 test
|
|
|
|
|/ A->C
|
|
|
|
|
|
|
|
|
o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
|
|
|
|
origin
|
|
|
|
|