annotate en/examples/branching.stable.out @ 435:7e52f0cc4516

changed es/hgext.tex changed es/hook.tex changed es/kdiff3.png changed es/license.tex changed es/mq-collab.tex changed es/mq-ref.tex changed es/mq.tex changed es/note.png changed es/tour-merge.tex changed es/undo-manual-merge.dot changed es/undo-non-tip.dot files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat, 18 Oct 2008 15:44:41 -0500
parents fe9237037e4d
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{hg clone stable stable-fix}
390
fe9237037e4d Fixed sample output for 'branching' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 179
diff changeset
2 updating working directory
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{cd stable-fix}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{echo 'This is a fix to a boring feature.' > myfile}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{hg commit -m 'Fix a bug'}
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 $ \textbf{hg push}
435
7e52f0cc4516 changed es/hgext.tex
jerojasro@localhost
parents: 390
diff changeset
8 pushing to
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 searching for changes
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 adding changesets
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 adding manifests
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 adding file changes
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 added 1 changesets with 1 changes to 1 files