Mercurial > hgbook

annotate en/examples/branching.merge.out @ 510:006cd2b41d11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected translation of a term
author Javier Rojas <jerojasro@devnull.li>
date Mon, 10 Nov 2008 22:20:46 -0500
parents 5fc4a45c069f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{cd ../main}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{hg pull ../stable}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 pulling from ../stable
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 searching for changes
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 adding changesets
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 adding manifests
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 adding file changes
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 added 1 changesets with 1 changes to 1 files (+1 heads)
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 (run 'hg heads' to see heads, 'hg merge' to merge)
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 $ \textbf{hg merge}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 merging myfile
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 (branch merge, don't forget to commit)
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 $ \textbf{cat myfile}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 This is a fix to a boring feature.
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17 This is exciting and new!