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

Re: Issue found: rename prior to merge --reintegrate

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 30 Jun 2008 07:50:19 -0400

On Mon, Jun 30, 2008 at 2:59 AM, Baeriswyl Kuno - Extern (IT-BA-MV)
<kuno.baeriswyl_at_sbb.ch> wrote:

> Windows XP
> svn, version 1.5.0 (r31699)
> I've found an issue with renames and merge --reintegrate. After any rename
> operation in my repository, the merge --reintegrate operation complains
> about unmerged revisions. Even if, the rename was been made prior the branch
> initiation.

This is something we have known about for a while. I posted a
detailed followup to your post on users@.

There is nothing wrong with the repository. Merge --reintegrate just
does a bunch of pre-merge checks and it does not pass those checks in
this situation. You can still use the older 2-URL merge syntax that
--reintegrate uses internally when the checks pass. There are a
couple ideas for how we can improve this so that you can use

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-30 13:50:38 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.