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

Re: svn commit: r1618024 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/tree_conflicts.c

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 18 Aug 2014 16:27:24 +0200

On Mon, Aug 18, 2014 at 02:33:38PM +0200, Bert Huijben wrote:
> > -----Original Message-----
> > From: stsp_at_apache.org [mailto:stsp_at_apache.org]
> > Sent: donderdag 14 augustus 2014 21:23
> > To: commits_at_subversion.apache.org
> > Subject: svn commit: r1618024 - in /subversion/trunk/subversion:
> > libsvn_client/merge.c libsvn_wc/tree_conflicts.c
> >
> > Author: stsp
> > Date: Thu Aug 14 19:22:30 2014
> > New Revision: 1618024
>
> At your request, a review of this change.
>
> I found a small issue around replacement detection, see inline.

Thanks! r1618616 (and r1618617) address this.
Received on 2014-08-18 16:28:03 CEST

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.