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

RE: Re: Merging moved files

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-05-17 17:08:10 CEST

Has an issue been reported, and can I track the progress? This is
actually a big issue for me right now, since I made a whole lot of
changes, and need to merge them back into our trunk. Since I can't
really rely on the Subversion developers to fix this in a timely manner,
I'm going to have to figure out a way to do this painstakingly one dir
at a time.

So the question I have now is, how do I perform this? The easiest, and
possibly the only sane way to do this that I can think of is to view the
log of the trunk then merge each dir with changes into the reorg branch
moved directory, then merge the reorg branch back into the trunk. I
can't see how it is possible to merge the reorg branch moved dirs
directly back to the trunk dirs original location.

-- Simon

-----Original Message-----
From: Michael W Thelen [mailto:thelenm@cs.utah.edu]
Sent: Friday, May 14, 2004 4:02 PM
To: Subversion Users (E-mail)
Subject: Re: Merging moved files

* Simon McClenahan <smcclenahan@healthcompartners.com> [2004-05-14
> OK, if you think this is clearer, I'll start from scratch.
> C:\projects\test\trunk>svn list --recursive -v
> 15 smcclena May 14 10:43 origdir/
> 15 smcclena 24 May 14 10:43 origdir/file.txt
> Create the branch
> C:\projects\test>svn copy trunk branches/reorg
> A branches\reorg

Just as clarification for others trying to reproduce the problem, there
needs to be a commit at this point, too. Otherwise you'll get problems
when trying to do the 'svn mv origdir/file.txt newdir' later on.
Following your transcript (thanks), I was able to reproduce the results
you're seeing: it does seem that trunk modifications to origdir/file.txt
are not included in newdir/file.txt when the merge happens.

-- Mike

NOTE: This message and any included attachments are from HealthCom Partners, LLC and are intended only for the addressee(s). The information contained herein may include trade secrets or privileged or otherwise confidential information. Unauthorized review, forwarding, printing, copying, distributing, or using such information is strictly prohibited and may be unlawful. If you received this message in error, or have reason to believe you are not authorized to receive it, please promptly delete this message and notify the sender by e-mail.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 17 17:08:44 2004

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.