annotate en/examples/branch-repo.new.out @ 356:0db175abfaf3
some friggin' merge or something like that.
| author |
jerojasro@localhost |
| date |
Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents |
58e3a6c76725 |
| children |
|
| rev |
line source |
|
bos@198
|
1 $ \textbf{cd ..}
|
|
bos@198
|
2 $ \textbf{hg clone myproject my-feature}
|
|
hg@298
|
3 updating working directory
|
|
bos@198
|
4 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@198
|
5 $ \textbf{cd my-feature}
|
|
bos@199
|
6 $ \textbf{echo 'This sure is an exciting new feature!' > mynewfile}
|
|
bos@198
|
7 $ \textbf{hg commit -A -m 'New feature'}
|
|
bos@199
|
8 adding mynewfile
|
|
bos@199
|
9 $ \textbf{hg push}
|
|
bos@199
|
10 pushing to
|
|
bos@199
|
11 searching for changes
|
|
bos@199
|
12 adding changesets
|
|
bos@199
|
13 adding manifests
|
|
bos@199
|
14 adding file changes
|
|
bos@199
|
15 added 1 changesets with 1 changes to 1 files
|
