[ale] Strategies for OS code in the Enterprise

[Christopher Fowler]

I'm not suer if you can find software that can merge like you want. 
Think about it.  When I hand patch stuff I have to do it because my
changes vs the tree are so dramatic.  How can a piece of software
understand changes that include removal of code and addition of new
code.  It would almost have to be able to read the code and understand
what is going on so changes can be merged together.

Lets say a function has be deprecated in DEV that was in STABLE.  You
made major changes to that function and now it is gone.  How is a merge
tool going to know where to place your changes so that DEV now operates
like you programmed STABLE?

On Tue, 2003-12-23 at 08:36, John Wells wrote:
> Perhaps I didn't state my question clearly...
> 
> At no time have I doubted to value of contributing our code back to the
> project, and my developers have already contacted the IssueTracker project
> owners to discuss this.
> 
> However, since the changes between DEV and STABLE are substantial, and
> because certain areas have been majorly rewritten, we need a way to be
> able to continue to use and develop against STABLE, while merging portions
> of DEV as we see fit.
> 
> I guess really what I'm after is a good project merge tool...CVS's hand
> diff-n-merge is fine, but I'm sure other solutions exist?
> _______________________________________________
> Ale mailing list
> Ale at ale.org
> http://www.ale.org/mailman/listinfo/ale