Hi all,
I have a repo with 2 feature-branches which need to be synced
regularly: "feature1" and "feature2" created from "trunk" at
different times. 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. TortoiseSVN tries to find
the new merge targets and does so successfully for "mod1", but never
for "mod2". Instead it suggests the new dir of "mod1" again always as
possible merge target and that way the conflict can't be resolved
ever.
I tried the same with the SVN-client on the shell and in case of such
conflicts it tries as well to find new merge targets. But if it
can't or its decision is simply wrong, it offers me an additional
choice to manually choose among the possible targets. Those choices
ALWAYS contain the correct target I'm interested in, so that I can
successfully resolve the conflict. TSVN OTOH NEVER offered me those
additional choices.
> Select: (p) Postpone, (r) Mark as resolved,
> (m) Apply to move destination,
> (d) Set repository move destination path, (h) Help,
> (q) Quit resolution: d
Does TSVN similarly support choosing between multiple destination
targets somehow? Am I missing a setting or doing something wrong?
Thanks!
Mit freundlichen Grüßen,
Thorsten Schöning
--
Thorsten Schöning E-Mail: Thorsten....@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