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

Re: Problem with Perl bindings?

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 26 Jul 2013 11:50:10 +0100

Roderich Schupp <roderich.schupp_at_gmail.com> writes:

> I'm going to commit this to trunk and nominate for backports to 1.7 and 1.8.

The trunk change doesn't merge cleanly to either 1.8 or 1.7 so you will
need to prepare backports: make backport branches from 1.7.x and 1.8.x
branches, merge the change, resolve the conflicts and then nominate the
branches.

The conflict has to be resolved at some point and doing it in advance
means a) it's clear what change is being proposed and b) it can be
merged automatically.

-- 
Philip Martin | Subversion Committer
WANdisco | Non-Stop Data
Received on 2013-07-26 12:50:51 CEST

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