Feedback from evaluation in a corporate environment

[Robert Collins]

On Fri, 2010-01-08 at 16:40 +0900, Stephen J. Turnbull wrote:
> Gotta run, but I'm very pleased by how nicely you were able to support
> my guesses.  Obviously there's a well-designed, capable DAG handling
> engine in there ... with a little study of your post, probably I can
> give up my git "crutch" for explaining bzr. :-)

Thanks!

> Two easy comments:
> 
> Robert Collins writes:
> 
>  > > when you need coherency in names of heads).  git goes this one better
>  > > with reflogs
>  > 
>  > I don't see how reflogs really impact things here: yes it gives you a
>  > way to address the two heads, but you still need to resolve things
>  > eventually.
> 
> OK, git goes 0.5 better. :-)
> 
> I just like having a well-known name for the other head, rather than
> having to dig it out with a tool I use once in a blue moon (I've
> already forgotten your explanation of how to dig out the other head's
> ID in bzr that you gave me once).  This allows me to postpone dealing
> with the implicit branch indefinitely.

Usually I just refer to the origin branch. Often I know immediately that
I will want to merge (resolve the fork) or rebase (resolve
differently ;P) or just discard one side or the other.

Getting at the revid itself isn't particularly useful - it was mainly a
way to show you at the time that its there, IIRC.

One thing one can do is just to make a new branch with the conflicting
head in it, if going offline or whatever:
bzr branch :parent ../naughtydifference

>  > Doable but not a particular improvement IMO - just piping straight
>  > through fastimport should behave very well for git itself, and tolerably
>  > for bzr and other systems.
> 
> Not on the XEmacs CVS repository.  Gawd, what a mess. ;-)  As Uri said,
> it's very useful to save the fastimport dump, because producing it is
> by far the largest time sink.  But it's small enough (fastimport blob
> file is 4GB, revision file is < 100MB) that I just keep it in raw form.
> Uri's is about 2 orders of magnitude bigger.  Wow!

As yes, now if we just had a pipe of infinite length ;)

-Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100108/cc546e34/attachment.pgp