RE: resolving tree conflicts

I'm trying to re-patch in the lost trunk changes using a series of per-file merges eg:

svn merge http://smack/codebase/branches/morpheme/2/morpheme/connect/src/app/Editors/mcPalettePanel.cpp@55862 http://smack/codebase/trunk/morpheme/connect/src/mcPalettePanel.cpp@HEAD morpheme\connect\src\app\Editors\mcPalettePanel.cpp

ie, I'm trying to get the difference between the head of the trunk and the head of the branch and them merge them into the moved file in my working copy (therefore restoring the lost trunk changes). This appears to be working in many cases, but in some cases it produces the reverse of what I'd expect.

Any ideas?

> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: 13 July 2009 17:42
> To: James French
> Cc: users_at_subversion.tigris.org
> Subject: Re: resolving tree conflicts
>
> On Mon, Jul 13, 2009 at 05:37:47PM +0100, James French wrote:
> > Thanks for the detailed explanation. However, I disagree that the
> > reorg shouldn't have been on the branch. Sure, the merge I'm doing
> now
> > is unpleasant, but once its down future traffic should be easy. If it
> > was the other way round we'd have to cope with it over and over
> again.
> >
> > Boy am I looking forward to when svn can cope better with this! Any
> > hints when this might happen?
>
> Not until some time after 1.7.
>
> Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371210

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-14 13:01:02 CEST