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

Re: svn commit: r1438683 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 26 Jan 2013 11:39:11 +0100

On Fri, Jan 25, 2013 at 08:19:15PM -0000, pburba_at_apache.org wrote:
> Author: pburba
> Date: Fri Jan 25 20:19:15 2013
> New Revision: 1438683
>
> URL: http://svn.apache.org/viewvc?rev=1438683&view=rev
> Log:
> Fix issue #4306 'multiple editor drive file merges record wrong mergeinfo
> during conflicts'.

Hey Paul,

nice fix. I've created a backport branch for this and nominated it for 1.7.x.
Received on 2013-01-26 11:39:50 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.