git and bzr

Martin Pool mbp at canonical.com
Tue Nov 28 03:06:57 GMT 2006


On 28/11/2006, at 11:01am, Joseph Wakeling wrote:

[not cross-posted; although the previous thread was interesting I  
wouldn't like another huge cross-post.]
>

> A frustration with bzr is that pulling or
> merging patches from another branch or repo requires them to share the
> same HEAD.  Is this a requirement in git or can I say, "Hey, I like  
> that
> particular function in project XXX, I'm going to pull that individual
> bit of code and its development history into project YYY"?

("HEAD" normally means the current revision, and it won't be common  
between different branches.  I think you mean sharing the same origin  
revision.)

You can do this in bazaar by cherry-picking the changes you want.  We  
warn about merging between unrelated trees because it's an unusual  
operation, but perhaps we should change that balance.

-- 
Martin






More information about the bazaar mailing list