2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
|
2010-08-18 03:51:07 +04:00
|
|
|
$ cat <<EOF > merge
|
|
|
|
> import sys, os
|
2017-06-15 21:22:25 +03:00
|
|
|
> print("merging for", os.path.basename(sys.argv[1]))
|
2010-08-18 03:51:07 +04:00
|
|
|
> EOF
|
2017-06-21 00:31:18 +03:00
|
|
|
$ HGMERGE="$PYTHON ../merge"; export HGMERGE
|
2010-08-18 03:51:07 +04:00
|
|
|
|
2011-04-19 14:04:44 +04:00
|
|
|
$ hg init A1
|
2010-08-18 03:51:07 +04:00
|
|
|
$ cd A1
|
|
|
|
$ echo This is file foo1 > foo
|
|
|
|
$ echo This is file bar1 > bar
|
|
|
|
$ hg add foo bar
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit text"
|
2010-08-18 03:51:07 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg clone A1 B1
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
|
|
$ cd A1
|
|
|
|
$ rm bar
|
|
|
|
$ hg remove bar
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit test"
|
2010-08-18 03:51:07 +04:00
|
|
|
|
|
|
|
$ cd ../B1
|
|
|
|
$ echo This is file foo22 > foo
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit test"
|
2010-08-18 03:51:07 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg clone A1 A2
|
|
|
|
updating to branch default
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg clone B1 B2
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
|
|
$ cd A1
|
|
|
|
$ hg pull ../B1
|
|
|
|
pulling from ../B1
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
2019-11-07 21:50:10 +03:00
|
|
|
added 1 changesets with 1 changes to 1 files
|
2010-08-18 03:51:07 +04:00
|
|
|
$ hg merge
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit test"
|
2010-08-18 03:51:07 +04:00
|
|
|
bar should remain deleted.
|
|
|
|
$ hg manifest --debug
|
|
|
|
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
|
|
|
|
|
|
|
$ cd ../B2
|
|
|
|
$ hg pull ../A2
|
|
|
|
pulling from ../A2
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
2019-11-07 21:50:10 +03:00
|
|
|
added 1 changesets with 0 changes to 0 files
|
2010-08-18 03:51:07 +04:00
|
|
|
$ hg merge
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit test"
|
2010-08-18 03:51:07 +04:00
|
|
|
bar should remain deleted.
|
|
|
|
$ hg manifest --debug
|
|
|
|
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|