bzr pull, bzr merge could show the log entry for retrieved revisions

[Michael Ellerman]

On Wed, 26 Oct 2005 06:41, Matthieu Moy wrote:
> I'd like to be able to do "missing" and "pull" or "merge" in a single
> command.
>
> Something like
>
> $ bzr log -r -1..
> revno: 1334
> committer: mbp at sourcefrog.net
> timestamp: Mon 2005-10-24 18:37:38 +1000
> message:
>   More merge/fetch tests
> $ bzr pull --verbose
> ------------------------------------------------------------
> revno: 1335
> committer: mbp at sourcefrog.net
> timestamp: Mon 2005-10-24 19:15:57 +1000
> message:
>   Unconditionally fetch all new history during merge
> ------------------------------------------------------------
> revno: 1336
> committer: mbp at sourcefrog.net
> timestamp: Mon 2005-10-24 20:05:58 +1000
> message:
>   Doc

I think that could be nice.

Slightly OT:

I was actually thinking yesterday about "pull" and "merge". Some people seem 
to think pull should _just_ pull, and if it can't it should exit. Others 
think pull should fall back to a merge.

It turns out in git, I found out the hard way, that pull means pull + merge. 
Personally that bugs me, because it means you can inadvertantly diverge your 
tree.

Perhaps we need a "mirror" command which is explicitly used for mirroring 
someone else's tree. It could be smart too, eg:

$ ls somebranch
ls: somebranch: No such file or directory
$ bzr mirror http://foo.bar.com/somebranch	<-- does a branch for you
$ cd somebranch
$ bzr mirror http://foo.bar.com/somebranch	<-- does a strict pull

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051026/59ef4d91/attachment.pgp