test-filebranch.t
146 lines
| 3.5 KiB
| text/troff
|
Tads3Lexer
/ tests / test-filebranch.t
|
r12192 | This test makes sure that we don't mark a file as merged with its ancestor | ||
when we do a merge. | ||||
$ cat <<EOF > merge | ||||
|
r33687 | > from __future__ import print_function | ||
|
r12192 | > import sys, os | ||
|
r33687 | > print("merging for", os.path.basename(sys.argv[1])) | ||
|
r12192 | > EOF | ||
|
r33286 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE | ||
|
r12192 | |||
Creating base: | ||||
$ hg init a | ||||
$ cd a | ||||
$ echo 1 > foo | ||||
$ echo 1 > bar | ||||
$ echo 1 > baz | ||||
$ echo 1 > quux | ||||
$ hg add foo bar baz quux | ||||
$ hg commit -m "base" | ||||
$ cd .. | ||||
$ hg clone a b | ||||
updating to branch default | ||||
4 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Creating branch a: | ||||
$ cd a | ||||
$ echo 2a > foo | ||||
$ echo 2a > bar | ||||
$ hg commit -m "branch a" | ||||
Creating branch b: | ||||
$ cd .. | ||||
$ cd b | ||||
$ echo 2b > foo | ||||
$ echo 2b > baz | ||||
$ hg commit -m "branch b" | ||||
We shouldn't have anything but n state here: | ||||
$ hg debugstate --nodates | grep -v "^n" | ||||
|
r12316 | [1] | ||
|
r12192 | |||
Merging: | ||||
$ hg pull ../a | ||||
pulling from ../a | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files (+1 heads) | ||||
|
r34662 | new changesets bdd988058d16 | ||
|
r12192 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg merge -v | ||||
resolving manifests | ||||
getting bar | ||||
merging foo | ||||
|
r13439 | merging for foo | ||
|
r12192 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
$ echo 2m > foo | ||||
$ echo 2b > baz | ||||
$ echo new > quux | ||||
$ hg ci -m "merge" | ||||
main: we should have a merge here: | ||||
|
r14323 | $ hg debugindex --changelog | ||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 0 cdca01651b96 000000000000 000000000000 | ||||
1 1 f6718a9cb7f3 cdca01651b96 000000000000 | ||||
2 2 bdd988058d16 cdca01651b96 000000000000 | ||||
3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 | ||||
|
r12192 | |||
log should show foo and quux changed: | ||||
$ hg log -v -r tip | ||||
changeset: 3:d8a521142a3c | ||||
tag: tip | ||||
parent: 1:f6718a9cb7f3 | ||||
parent: 2:bdd988058d16 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
files: foo quux | ||||
description: | ||||
merge | ||||
foo: we should have a merge here: | ||||
|
r14182 | $ hg debugindex foo | ||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 0 b8e02f643373 000000000000 000000000000 | ||||
1 1 2ffeddde1b65 b8e02f643373 000000000000 | ||||
2 2 33d1fb69067a b8e02f643373 000000000000 | ||||
3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a | ||||
|
r12192 | |||
bar: we should not have a merge here: | ||||
|
r14182 | $ hg debugindex bar | ||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 0 b8e02f643373 000000000000 000000000000 | ||||
1 2 33d1fb69067a b8e02f643373 000000000000 | ||||
|
r12192 | |||
baz: we should not have a merge here: | ||||
|
r14182 | $ hg debugindex baz | ||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 0 b8e02f643373 000000000000 000000000000 | ||||
1 1 2ffeddde1b65 b8e02f643373 000000000000 | ||||
|
r12192 | |||
quux: we should not have a merge here: | ||||
|
r14182 | $ hg debugindex quux | ||
|
r37301 | rev linkrev nodeid p1 p2 | ||
0 0 b8e02f643373 000000000000 000000000000 | ||||
1 3 6128c0f33108 b8e02f643373 000000000000 | ||||
|
r12192 | |||
Manifest entries should match tips of all files: | ||||
$ hg manifest --debug | ||||
33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar | ||||
2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz | ||||
aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo | ||||
6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux | ||||
Everything should be clean now: | ||||
$ hg status | ||||
$ hg verify | ||||
checking changesets | ||||
checking manifests | ||||
crosschecking files in changesets and manifests | ||||
checking files | ||||
|
r39525 | checked 4 changesets with 10 changes to 4 files | ||
|
r12192 | |||
|
r16913 | $ cd .. | ||