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

Re: Subversion 1.5 about reintegrate and renames

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 3 Jul 2008 10:08:58 -0400

On Thu, Jul 3, 2008 at 10:04 AM, rjk1408 <rohanjoseph_at_gmail.com> wrote:
> I read through your blog-post. You mention refactoring and effective
> communication between team mates to make sure such problems don't crop in.
> Could you please explain what then would be a best known method or best
> practices for merging AFTER a rename has taken place? For example, lets say
> 10 files on a branch have been renamed and committed in a single commit
> transaction. If a merge from the branch to the trunk has to happen now, how
> would one go about fixing this problem? (I assume neither --reintegrate nor
> the 2-URL syntax are the way to solve this now)

The current issue with reintegrate is just that some "error checking"
it does is blocking the merge from running. When it does run, it is
just a 2-URL merge. So they are the same thing.

There is no Subversion merge (or update, or switch) option that
follows a rename and merges the contents into the renamed file for
you. I do not really know what your options are when you have done
that. Perhaps a file by file merge on the renamed files? Basically
the equivalent of create a patch with the changes in it, and apply it
to the other file name.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-03 16:10:19 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.