annotate en/examples/branch-repo.bugfix.out @ 654:b08f6a61bf15

Merge
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Feb 2009 22:59:50 -0800
parents 7e52f0cc4516
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
198
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg clone myproject-1.0.1 my-1.0.1-bugfix}
397
2b8c6aa370d5 Fix sample output for test 'branch-repo'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 198
diff changeset
2 updating working directory
198
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{cd my-1.0.1-bugfix}
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{echo 'I fixed a bug using only echo!' >> myfile}
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{hg commit -m 'Important fix for 1.0.1'}
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 $ \textbf{hg push}
435
7e52f0cc4516 changed es/hgext.tex
jerojasro@localhost
parents: 397
diff changeset
8 pushing to
198
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 searching for changes
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 adding changesets
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 adding manifests
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 adding file changes
615f3c6b30e1 Start to describe branch management.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 added 1 changesets with 1 changes to 1 files