Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update.out @ 612:9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
# HG changeset patch
# User Alecs King <alecsk@gmail.com>
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
> On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote:
> > Hg is really very nice. The only feature i miss from git is the
> > whatchanged -p, which shows a diff along with a changeset.
> > python before, i just dig into the mercurial/commands.py a while and
> > see what diff(), dodiff(), export(), show_changeset(), log() would
> > normally do. There might be one thing or two missed or wrong. But here
> > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg
> > log -d' to show the whole history with the diff or 'hg log -d <file>' to
> > show that info of a particular file. And also works with the '-r'
> > option.
>
> Let's use -p. We're going to be combining the global and per command
> switch namespace shortly and the global -p will disappear.
Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have
'hg log -p'.
> Also, the argument list for show_changeset is getting a bit unwieldy.
This time i remain show_changeset untouched at all. Only changed some
bits of log().
author | Alecs King <alecsk@gmail.com> |
---|---|
date | Mon, 04 Jul 2005 12:15:44 -0800 |
parents | c5705ab9cebd |
children | 5d6177b72fcc |
rev | line source |
---|---|
331 | 1 + mkdir test |
2 + cd test | |
3 + echo foo | |
4 + hg init | |
5 + hg addremove | |
6 + hg commit -t 1 | |
7 + hg verify | |
8 checking changesets | |
9 checking manifests | |
10 crosschecking files in changesets and manifests | |
11 checking files | |
12 1 files, 1 changesets, 1 total revisions | |
485 | 13 + hg clone . ../branch |
14 + cd ../branch | |
331 | 15 + hg co |
16 + echo bar | |
17 + hg commit -t 2 | |
18 + cd ../test | |
19 + hg pull ../branch | |
404 | 20 pulling from ../branch |
331 | 21 searching for changes |
22 adding changesets | |
23 adding manifests | |
24 adding file revisions | |
25 modified 1 files, added 1 changesets and 1 new revisions | |
404 | 26 (run 'hg update' to get a working copy) |
331 | 27 + hg verify |
28 checking changesets | |
29 checking manifests | |
30 crosschecking files in changesets and manifests | |
31 checking files | |
32 1 files, 2 changesets, 2 total revisions | |
33 + hg co | |
34 + cat foo | |
35 foo | |
36 bar | |
37 + hg manifest | |
38 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |