[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: It's time to fix Subversion Merge

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 12 Jul 2011 11:00:10 -0400

On Tue, Jul 12, 2011 at 10:52 AM, Julian Foad <julian.foad_at_wandisco.com> wrote:

> A script has the advantage that it could be tried and even rolled out by
> people who are still using 1.6.x.
> None of that is a reason not to start a branch.

+1 on the branch. But wouldn't it make sense to defer creating the
branch for as long as possible? If Andy's team wants to explore
scripts first why create a branch that is just going to immediately
start getting stale? Maybe we should start with patches to trunk and
make the branch when there is something to not include on trunk?

FWIW, I would also like to see more dev@ discussion and less private
discussion. Before we start working on a new command seems we ought
to discuss the ideas more. As I mentioned a new command is going to
need a way to force users to use the new command or else all the same
issues have to be addressed. If we can force users to do something,
then I am not sure we need a new command. We can just have a way to
not allow users to use the features of existing merge that we do not
want them to use. The existing merge command already supports the
proposed simple syntax.

Mark Phippard
Received on 2011-07-12 17:00:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.