Re: svn commit: r18231 - branches/1.3.x

On 1/25/06, Blair Zajac <blair@orcaware.com> wrote:
> djames@tigris.org wrote:
> > Author: djames
> > Date: Wed Jan 25 14:09:41 2006
> > New Revision: 18231
> >
> > Modified:
> > branches/1.3.x/STATUS
> >
> > Log:
> > * STATUS: Nominate and vote for r18230. Vote +1 (concept) on r18215, noting
> > that r18215 needs a merge branch to resolve conflicts.
>
> Do we have a policy on how much of a conflict is required before using a merge
> branch?
>
> This commit was trivial (2 lines in configure.in) and could be done by hand in
> the 1.3.x branch to resolve it. In fact, the easy was would be to do the merge,
> revert configure.in and make the change by hand.
>
> Maybe using a branch isn't a bad idea :)

I looked at r18215, and I didn't find it was immediately obvious how
to merge it to the 1.3.x branch. For this reason, I'd like to see a
merge branch before I can approve the change.

In general, I'd say it's best to use merge branches for all
conflicting backports, because it's the safest thing to do. I don't
want to approve a change and then later find out that the change was
merged incorrectly.

Thanks,

David

--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org