facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

Make test-merge7 repeatable

Browse Source
This commit is contained in:
Matt Mackall 2005-09-27 14:53:11 -07:00
parent f2dd52a8e4
commit 227eff2fe8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test-merge7
View File

@ -34,7 +34,7 @@ EOF
hg commit -m "2 -> 2.5" -d "0 0"
# now pull and merge from test-a
hg pull
hg pull ../test-a
HGMERGE=merge hg update -m
# resolve conflict
cat >test.txt <<"EOF"
@ -52,14 +52,14 @@ one
two-point-one
three
EOF
hg commit -m "two -> two-point-one"
hg commit -m "two -> two-point-one" -d "0 0"
# pull and merge from test-a again
cd ../test-b
hg pull
hg pull ../test-a
HGMERGE=merge hg update --debug -m
cat test.txt
cat test.txt | sed "s% .*%%"
hg debugindex .hg/data/test.txt.i

12
tests/test-merge7.out
View File

@ -1,4 +1,4 @@
pulling from /tmp/hgtests.12359.29374.16319.16463/test-merge7/test-a
pulling from ../test-a
searching for changes
adding changesets
adding manifests
@ -8,7 +8,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads)
merge: warning: conflicts during merge
merging test.txt
merging test.txt failed!
pulling from /tmp/hgtests.12359.29374.16319.16463/test-merge7/test-a
pulling from ../test-a
searching for changes
adding changesets
adding manifests
@ -25,11 +25,11 @@ resolving test.txt
file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
merging test.txt failed!
one
<<<<<<< /tmp/hgtests.12359.29374.16319.16463/test-merge7/test-b/test.txt
<<<<<<<
two-point-five
=======
two-point-one
>>>>>>> /tmp/test.txt~other.bN33Pl
>>>>>>>
three
rev offset length base linkrev nodeid p1 p2
0 0 7 0 0 01365c4cca56 000000000000 000000000000
@ -37,11 +37,11 @@ three
2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000
3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557
4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000
changeset: 4:50aec39675ea
changeset: 4:40d11a4173a8
tag: tip
parent: 2:96b70246a118
user: test
date: Mon Sep 26 23:50:15 2005 +0000
date: Thu Jan 1 00:00:00 1970 +0000
summary: two -> two-point-one
changeset: 3:50c3a7e29886