Mercurial > hgbook

annotate en/examples/tour-merge-conflict.pull.out @ 144:006bbad1f190

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add expected output files. This makes it possible to spot changes in Mercurial's output and behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:44:56 -0800
parents
children e281bd9a8e47
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{cd ..}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{hg clone scam-cousin scam-merge}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{cd scam-merge}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{hg pull -u ../scam-son}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 pulling from ../scam-son
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 searching for changes
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 adding changesets
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 adding manifests
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 adding file changes
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 added 1 changesets with 1 changes to 1 files (+1 heads)
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 not updating, since new heads added
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 (run 'hg heads' to see heads, 'hg merge' to merge)