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

Re: Out-of-date error merging a renamed and replaced file

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-05-11 18:34:53 CEST

On 5/11/06, Avi Kivity <avi@qumranet.com> wrote:
> The script below will fail the 'svn merge' command. A developer has
> renamed a file and created a new file with the same name in one commit.
> Another developer tried merge this change, but subversion (1.3.1) failed.
>
> I googled a bit for the out of date error, but am not sure whether this
> is a known issue or not.

This looks like it was fixed in the trunk and 1.4.x branches already,
so you should see a fix in 1.4.0 when it comes out.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 11 18:35:22 2006

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