Tracking Third-Party Sources (Vendor Branches)?
bulb at ucw.cz
Wed May 17 09:30:35 BST 2006
On Tue, May 16, 2006 at 13:36:27 -0500, Matthew D. Fuller wrote:
> On Tue, May 16, 2006 at 06:15:04PM +0200 I heard the voice of
> Erik B?gfors, and lo! it spake thus:
> > Without actually reading this document. This is how I do it. I find
> > bzr to be much better at doing this than what cvs/svn is.
> The difficulty with this (and what CVS currently does that bzr
> doesn't) is that you can't do this in a subdirectory. I think this is
> something like what "nested trees" is intended to support; I'd rather
> support it via re-rooted merges.
What do you mean by 'do it in a subdirectory'?
Note, that if branch a contains a file under name x and branch b renamed
it to y, merging correctly applies the changes from x on a to y on b.
This should even apply to adding files to subdirectories. The only
corner case is files added to root if you moved everything from root to
a subdir, because you can't 'move root'.
Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060517/03930803/attachment.pgp
More information about the bazaar