Re: Repository and release numbering changes

Chris Pickett <[email protected]> Sat, 12 Mar 2005 15:39:28 -0500
Newsgroups gmane.comp.java.vm.sablevm.devel
Message-ID <[email protected]>
Etienne Gagnon wrote:

> So, as always, it's no silver bullet, but it is a clear improvement over
> the status quo.

Yes, definitely.

> Merging has always been (and will probably remain for a very long time)
> a difficult problem.  I do not believe that any tool will ever be able
> to always do a correct automated merge for all cases.  You will need a
> human to use his/her brain to see if the tool's proposal is fine.

Also agreed :)

FWIW, merging won't get addressed in svn until after 1.2; for 1.2 
they're trying to get locking in place.

Chris