On Mon, 2011-08-29 at 13:27 +0200, Stefan Sperling wrote:
> On Fri, Aug 26, 2011 at 05:27:16PM +0100, Julian Foad wrote:
> > I (Julian Foad) wrote:
> > > I was just cleaning up this editor, stripping out this "target" path
> > > completely, so that it would simply pass relative paths out to the dif
On Fri, Aug 26, 2011 at 05:27:16PM +0100, Julian Foad wrote:
> I (Julian Foad) wrote:
> > I was just cleaning up this editor, stripping out this "target" path
> > completely, so that it would simply pass relative paths out to the diff
> > callbacks and to the notification functions. The merge code
I (Julian Foad) wrote:
> I was just cleaning up this editor, stripping out this "target" path
> completely, so that it would simply pass relative paths out to the diff
> callbacks and to the notification functions. The merge code knows what
> WC path this diff relates to, and so can add the prefix
On Wed, 2011-08-24, s...@apache.org wrote:
> Author: stsp
> Date: Wed Aug 24 18:26:19 2011
> New Revision: 1161219
>
> URL: http://svn.apache.org/viewvc?rev=1161219&view=rev
> Log:
> Auto-resolve 'local move vs. incoming edit' conflicts for files during merge.
>
> * subversion/libsvn_client/repos
4 matches
Mail list logo
