[PATCH] pull shows location

[John A Meinel]

Aaron Bentley wrote:

>On Sat, Jun 25, 2005 at 08:20:03PM -0500, John A Meinel wrote:
>
>
>>Actually, reading the documentation makes it look like it should be
>>called "parent". Since it is the default push & pull location.
>>
>>'friends' is for trees that we have merged from/to, 'parent' is for the
>>push/pull location.
>>
>>
>
>I'm not sure there's a difference anymore between trees we merge from
>and those we pull from.  In fact, Martin has suggested that pull might
>do a merge when branches have diverged.
>
>Aaron
>
>
>
Interesting.
However, for my personal use case, there would indeed be a "parent"
versus other branches I have merged from. Because I would keep a central
repository, and that would be a tree that should stay in sync. I can
understand that to keep it up-to-date might require a merge rather than
a plain pull (because someone else (me) might have committed remotely)
and I didn't pull before I did my commit.

But in my head that is the 'upstream' or 'parent' branch, versus all of
the other branches that I might merge from.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050626/8592d31d/attachment.pgp