Re: resolving tree conflicts

On Tue, Jul 14, 2009 at 11:59:59AM +0100, James French wrote:
> I'm trying to re-patch in the lost trunk changes using a series of
> per-file merges eg:

Why were changes "lost"? And what do you mean when you say "lost"?

> 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.

What exactly do you expect to happen, and what does happen instead?

It seems to me like you haven't yet applied to trunk the refactoring
changes the branch contains. Why not? Wouldn't this make this merge
much easier?

Stefan
Received on 2009-07-14 13:17:34 CEST