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

RE: Re: Re: Merging moved files

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-05-19 22:28:36 CEST

I have reported the bug.

Just a thought - could the svn_load_dirs.pl script be modified to
include a merge as well as or instead of an import?

-- Simon

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

* Simon McClenahan <smcclenahan@healthcompartners.com> [2004-05-17
> 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
> I'm going to have to figure out a way to do this painstakingly one dir
> at a time.

There's not an issue for this that I can find. I think you should
definitely file one, and include the transcript you posted to the list.

> 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
> log of the trunk then merge each dir with changes into the reorg
> 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.

Yeah, since the trunk changes don't make it through the merge, that
seems like the least painful way to get around it. Sorry I don't have
any better suggestions :-(

-- 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 Wed May 19 22:29:49 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.