Mercurial > hgbook

annotate en/examples/branch-repo.merge.out @ 618:a529952fce96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed "un tag" to "una etiqueta". Same thing for "unos tags" "un tag" "el tag" "los tags" "de tag" "de tags"
author Javier Rojas <jerojasro@devnull.li>
date Sun, 18 Jan 2009 22:21:43 -0500
parents 58e3a6c76725
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
199
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg merge}
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 (branch merge, don't forget to commit)
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{hg push}
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 pushing to
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 searching for changes
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 adding changesets
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 adding manifests
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 adding file changes
58e3a6c76725 More branch/merge stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 added 2 changesets with 1 changes to 1 files