On Mon, Jul 13, 2009 at 12:16:18PM +0100, James French wrote:
> Hi,
>
> I have a situation where there has been lots of reorg (file moves and
> renames) on a branch that I want to sync down to the trunk. When I
> perform the merge (Tortoise 1.6.3, although server is still on 1.6.2)
> I get a lot of tree conflicts (about 200) due to the moved files being
> changed on the trunk. It is my understanding that the moved files that
> are added in my trunk working copy are directly from the branch and
> will not have the trunk changes incorporated.
>
> I would be eternally grateful if someone could give me a heads up as
> to how to resolve these problems as I've been playing about with this
> for a couple of days and I'm not confident I know what I'm doing and
> am getting increasingly frustrated.
Without knowing more details, all I can recommend is trying to replay
the refactoring changes which were made on the branch on trunk *before*
merging. That is, make sure the directory structures match by comitting
appropriate changes to trunk, and then do the merge. If you merge with
compatible tree structures you won't get any tree conflicts flagged.
Note that the current tree conflict support amounts to warning signals
only. No tree conflict will be resolved automatically right now.
There can also be false positives in some situations because of
limitations in Subversion's design. It's up to the user to either
make sure tree structures are compatible before doing a merge, or
resolving the conflicts after they've been flagged in a way that
creates the desired merge result.
If you still need more help, please provide precise descriptions
of the exact conflicts you have trouble resolving, and we can try
to find solutions together. It's not possible to describe a general
recipe for solving an arbitrary tree conflict, so we'll need more
information to help you.
Stefan
Received on 2009-07-13 14:45:27 CEST