test-merge6.t
73 lines
| 1.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-merge6.t
|
r11979 | $ cat <<EOF > merge | ||
> import sys, os | ||||
|
r33687 | > print("merging for", os.path.basename(sys.argv[1])) | ||
|
r11979 | > EOF | ||
|
r33286 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE | ||
|
r11979 | |||
|
r13956 | $ hg init A1 | ||
|
r11979 | $ cd A1 | ||
$ echo This is file foo1 > foo | ||||
$ echo This is file bar1 > bar | ||||
$ hg add foo bar | ||||
|
r12156 | $ hg commit -m "commit text" | ||
|
r11979 | |||
$ 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 | ||||
|
r12156 | $ hg commit -m "commit test" | ||
|
r11979 | |||
$ cd ../B1 | ||||
$ echo This is file foo22 > foo | ||||
|
r12156 | $ hg commit -m "commit test" | ||
|
r11979 | |||
$ 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 | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r34662 | new changesets b90e70beeb58 | ||
|
r38268 | 1 local changesets published | ||
|
r11979 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg merge | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
|
r12156 | $ hg commit -m "commit test" | ||
|
r11979 | 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 | ||||
added 1 changesets with 0 changes to 0 files (+1 heads) | ||||
|
r34662 | new changesets e1adc944e717 | ||
|
r11979 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg merge | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
|
r12156 | $ hg commit -m "commit test" | ||
|
r11979 | bar should remain deleted. | ||
$ hg manifest --debug | ||||
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | ||||
|
r16913 | |||
$ cd .. | ||||