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

Re: svn commit: r1485506 - /subversion/branches/1.6.x/CHANGES

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 23 May 2013 07:27:43 +0200

On Wed, May 22, 2013 at 11:58:18PM +0000, Daniel Shahaf wrote:
> r1485501 touches both the 1.6.23 and 1.7.10 sections, so it would conflict if
> merged. So I didn't merge it, instead, I applied the change by hand. When I
> tried to record-only merge that revision (to a pristine 1.6.x working copy,
> using an 1.8.0-rc2 client), I got mergeinfo changes on numerous files in the
> tree. Transcript attached. I would have expected only ./CHANGES to have
> property modifications, not any other file in the tree. Is there a bug in the
> behaviour recorded in the transcript?

This is a known issue with --record-only merges.
They always update all subtree mergeinfo.

I guess fixes are very welcome :)
Received on 2013-05-23 07:28:27 CEST

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