Re: Multiple Patching

["Ohadi, Hamid" <hamid.ohadi@xxxxxxxxxxxxxx>]

On 24-03-05 21:10, Thomas Glanzmann wrote:
> Hello,
> 
> > How do you multiple patch a source file when you can't successively
> > patch it?
> 
> I am using bitkeeper[1] to handle this. There is one tree which tracks
> CVS HEAD. Than I have one child-tree (clone) per feature. I import
> upstream changes in there and fix conflicts on a per feature basis. This
> also includes sometimes kicking the tree because the feature got
> included upstream completely. And than I have a working repository where
> I pull from all the features.
> 

Hi there,

That sounds really complicated to me. I would have thought there was a simple
solution to it. Thanks anyway.

Cheers!
Hamid