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

Re: Merging moved files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-05-11 18:12:24 CEST

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.

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:16:57 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.