Commits

Guido Ostkamp  committed e281bd9

Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').

  • Participants
  • Parent commits c36a6f5

Comments (0)

Files changed (6)

File en/examples/tour-merge-conflict

 Nigerian dictator Sani Abacha.
 EOF
 
+hg resolve -m letter.txt
 hg commit -m 'Send me your money'
 hg tip

File en/examples/tour-merge-conflict.commit.out

 > \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:   

File en/examples/tour-merge-conflict.cousin.out

 $ \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}

File en/examples/tour-merge-conflict.merge.out

 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!
 

File en/examples/tour-merge-conflict.pull.out

 $ \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}

File en/examples/tour-merge-conflict.son.out

 $ \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}