RE: Merging moved files

I have identified the issue as the result of performing a merge after files/directories have been moved around, as casually mentioned in the book.

Since I'm on Win32, if I can't provide the exact command that was used over a month ago, I can only take a guess, or examine some log output. I chose the latter.

To make the branch, my guess is something like:
svn copy http://bart/svn/online/trunk http://bart/svn/online/branches/reorg/

The merge command I used I followed the example and best practice by entering the revision numbers in the commit comment. i.e. my guess and brain memory recall is something like:
cd c:\projects\trunk
svn update
svn merge -r 98 http://bart/svn/online/branches/reorg/

To move stuff around, the svn move command would have been used. I showed the verbose log output for one file revision.

By "undo the commit of the merge," I have to assume you mean the "Undoing Changes" section in the book http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.2 . I am in the process of that now, but have hit a snag running svn cleanup in my WC. Moving whole directories around caused a lot of adding and deletes. Since I have to have a WC to receive changes, I may be better off checking-out the whole trunk HEAD again. Sigh.

I appreciate your help on this matter, and previous issues you have responded to. I'm just trying to figure out what the correct way to do a re-organization that the book alluded to is, since my current attempt doesn't seem to have the desired results.

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Tuesday, May 11, 2004 11:12 AM
To: Simon McClenahan
Cc: Subversion Users (E-mail)
Subject: Re: Merging moved files

On Tue, 2004-05-11 at 10:48, Simon McClenahan wrote:

> So I created my branch, and re-organized a whole bunch of stuff, by
> using svn move (or it's TortoiseSVN equivalent). In the mean time,
> work goes on in the trunk. Now I'm finally ready to merge the reorg
> branch into the trunk. An svn update in the branch produces nothing.
> Merging the branch into the trunk seems successful since a whole bunch
> of stuff was added or deleted. Unfortunately, the most recent stuff
> was deleted and the old stuff from the time of branch creation was
> added! The book says that svn move is actually an svn copy and delete.
> That means we keep the history, but the merge doesn't know anything
> about changes.

You've left out all the details of (1) how you made the branch, (2) how
you actually did the merge (what exact command did you run to do the
merge?) Without this information, it's hard to figure out what went
wrong. And I don't have the patience to look at your various log
outputs and try to guess what happened, or how to clean up the mess.

If I were you, I would undo the commit of the merge, so your trunk
returns back to its pristine pre-merge state.

Then, show us an exact transcript of your merge command, and the output
that results.

--------------------------
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 Tue May 11 18:59:30 2004