# HG changeset patch
# User Guido Ostkamp <hg@ostkamp.fastmail.fm>
# Date 1219262446 -7200
# Node ID e281bd9a8e4705fe9914ed14001494bd2c16f2c4
# Parent c36a6f534b996c6ddea38a90c3ff2ae9cd206fdc
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
diff -r c36a6f534b99 -r e281bd9a8e47 en/examples/tour-merge-conflict
--- a/en/examples/tour-merge-conflict Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict Wed Aug 20 22:00:46 2008 +0200
@@ -68,5 +68,6 @@
Nigerian dictator Sani Abacha.
EOF
+hg resolve -m letter.txt
hg commit -m 'Send me your money'
hg tip
diff -r c36a6f534b99 -r e281bd9a8e47 en/examples/tour-merge-conflict.commit.out
--- a/en/examples/tour-merge-conflict.commit.out Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict.commit.out Wed Aug 20 22:00:46 2008 +0200
@@ -3,6 +3,7 @@
> \textbf{I am Bryan O'Sullivan, no relation of the former}
> \textbf{Nigerian dictator Sani Abacha.}
> \textbf{EOF}
+$ \textbf{hg resolve -m letter.txt}
$ \textbf{hg commit -m 'Send me your money'}
$ \textbf{hg tip}
changeset:
diff -r c36a6f534b99 -r e281bd9a8e47 en/examples/tour-merge-conflict.cousin.out
--- a/en/examples/tour-merge-conflict.cousin.out Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict.cousin.out Wed Aug 20 22:00:46 2008 +0200
@@ -1,5 +1,6 @@
$ \textbf{cd ..}
$ \textbf{hg clone scam scam-cousin}
+updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd scam-cousin}
$ \textbf{cat > letter.txt <<EOF}
diff -r c36a6f534b99 -r e281bd9a8e47 en/examples/tour-merge-conflict.merge.out
--- a/en/examples/tour-merge-conflict.merge.out Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict.merge.out Wed Aug 20 22:00:46 2008 +0200
@@ -4,9 +4,7 @@
merge: warning: conflicts during merge
merging letter.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-There are unresolved merges, you can redo the full merge using:
- hg update -C 1
- hg merge 2
+use 'hg resolve' to retry unresolved file merges
$ \textbf{cat letter.txt}
Greetings!
diff -r c36a6f534b99 -r e281bd9a8e47 en/examples/tour-merge-conflict.pull.out
--- a/en/examples/tour-merge-conflict.pull.out Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict.pull.out Wed Aug 20 22:00:46 2008 +0200
@@ -1,5 +1,6 @@
$ \textbf{cd ..}
$ \textbf{hg clone scam-cousin scam-merge}
+updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd scam-merge}
$ \textbf{hg pull -u ../scam-son}
diff -r c36a6f534b99 -r e281bd9a8e47 en/examples/tour-merge-conflict.son.out
--- a/en/examples/tour-merge-conflict.son.out Wed Aug 20 21:58:19 2008 +0200
+++ b/en/examples/tour-merge-conflict.son.out Wed Aug 20 22:00:46 2008 +0200
@@ -1,5 +1,6 @@
$ \textbf{cd ..}
$ \textbf{hg clone scam scam-son}
+updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd scam-son}
$ \textbf{cat > letter.txt <<EOF}