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

How to help SVN finding moved directories during a sync-merge?

From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Mon, 24 Feb 2020 18:03:05 +0100

Hi all,

I have a repo with 178'000 revisions, and need to sync-merge 2
features branches: "feature1" and "feature2" created from "trunk" at
different times and "feature1" merged into "feature2" successfully
some days ago already. That merge needs to be repeated now, but I'm
runnig into trouble.

The problem is that "feature2" is about refactoring the directory
layout of "feature1", especially some directories got moved. I used
"svn mv" for that so that it could keep track of that in theory. The
following is a simplified example:

* feature1
  * mod1/src/de/File1.java
  * mod2/src/de/File2.java
* feature2
  * mod1/src/main/java/de/File1.java
  * mod2/src/main/java/de/File2.java

During merging SVN runs into conflicts because the merge-target dirs
of "mod1" and "mod2" don't exist anymore. I'm using TortoiseSVN and
that tries to find the new merge targets and does so successfully for
"mod1". The problem is that for the changes of "mod2", SVN suggests
the target dir of "mod1" as well again instead of "mod2" and this way
the conflict can't be resolved ever.

Is there some way to tell SVN the correct target dir? Or how should
that be resolved? The only thing I can currently think of is manually
applying patches.

Thanks!

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail: Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2020-02-24 18:03:12 CET

This is an archived mail posted to the Subversion Users mailing list.