test-merge6.out
53 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-merge6.out
|
r616 | + cat | ||
+ chmod +x merge | ||||
+ export HGMERGE=./merge | ||||
+ HGMERGE=./merge | ||||
+ mkdir A1 | ||||
+ cd A1 | ||||
+ hg init | ||||
+ echo This is file foo1 | ||||
+ echo This is file bar1 | ||||
+ hg add foo bar | ||||
|
r749 | + hg commit -m 'commit text' -d '0 0' | ||
|
r616 | + cd .. | ||
+ hg clone A1 B1 | ||||
+ cd A1 | ||||
+ rm bar | ||||
+ hg remove bar | ||||
|
r749 | + hg commit -m 'commit test' -d '0 0' | ||
|
r616 | + cd ../B1 | ||
+ echo This is file foo22 | ||||
|
r749 | + hg commit -m 'commit test' -d '0 0' | ||
|
r616 | + cd .. | ||
+ hg clone A1 A2 | ||||
+ hg clone B1 B2 | ||||
+ cd A1 | ||||
+ hg pull ../B1 | ||||
pulling from ../B1 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
|
r775 | adding file changes | ||
added 1 changesets with 1 changes to 1 files | ||||
|
r616 | (run 'hg update' to get a working copy) | ||
+ hg update -m | ||||
|
r749 | + hg commit -m 'commit test' -d '0 0' | ||
|
r616 | + echo bar should remain deleted. | ||
bar should remain deleted. | ||||
+ hg manifest | ||||
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | ||||
+ cd ../B2 | ||||
+ hg pull ../A2 | ||||
pulling from ../A2 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
|
r775 | adding file changes | ||
added 1 changesets with 0 changes to 0 files | ||||
|
r616 | (run 'hg update' to get a working copy) | ||
+ hg update -m | ||||
|
r749 | + hg commit -m 'commit test' -d '0 0' | ||
|
r616 | + echo bar should remain deleted. | ||
bar should remain deleted. | ||||
+ hg manifest | ||||
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | ||||