[ale] Strategies for OS code in the Enterprise

[Christopher Fowler]

If I remeber correctly I think it is free for up to 4 users.  I could
be wrong.


On Tue, Dec 23, 2003 at 11:18:09PM -0500, John Wells wrote:
> David,
> 
> I agree with you.  I admin'd perforce for a year or so, used it as a
> developer for at least two, and was pretty impressed with it's features
> and branch integration capabilities.
> 
> Unfortunately, unless a miracle happens in our capex meetings, it's way
> out of my budget ;)
> 
> Thanks for the suggestion regardless!
> 
> John
> 
> David Corbin said:
> > Actually, Perforce has very good merge tools built into it.  It would be
> > pretty easy to maintain your own tree, and merge in changes from the main
> > line.  Of course, Perforce isn't open source.  It is however, one of the
> > few
> > non-open source software systems I recommend because it works, is powerful
> > yet easy, and has AMAZINGLY good support if you need it.
> >
> > David
> > On Tuesday 23 December 2003 10:43, John Wells wrote:
> >> Chris,
> >>
> >> I'm not asking for an automated, artificially intelligent tool that
> >> could
> >> read my mind and keep what I want and discard what I do not.
> >>
> >> There are ways to provide information (like files that have changed,
> >> file
> >> differences, etc.) in an easy-to-read, easy-to-understand, easy-to-merge
> >> fashion.  Perhaps that's what I'm looking for.
> >>
> >> Perhaps such a tool does not exist.
> >>
> >> Anyway, thanks to all for the input.
> >>
> >> Christopher Fowler said:
> >> > 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
> >> >
> >> > _______________________________________________
> >> > Ale mailing list
> >> > Ale at ale.org
> >> > http://www.ale.org/mailman/listinfo/ale
> >>
> >> _______________________________________________
> >> Ale mailing list
> >> Ale at ale.org
> >> http://www.ale.org/mailman/listinfo/ale
> >
> > --
> > David Corbin <dcorbin at machturtle.com>
> >
> >
> 
> _______________________________________________
> Ale mailing list
> Ale at ale.org
> http://www.ale.org/mailman/listinfo/ale