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: [email protected] 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 -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/1239313326.20200225110525%40am-soft.de.
Changes destined for a directory arrived via the following revisions during merge of '^/branches/bug_2590/de.am_soft.sm_mtg.model/src/de:178475-179385': r179367 by [email protected] No such file or directory was found in the merge target working copy. The directory was moved to '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.oms/src/main/java/de' in r178707 by [email protected]. Ambiguous move destinations exist in the repository; try the 'd' option Select: (p) Postpone, (r) Mark as resolved, (m) Apply to move destination, (d) Set repository move destination path, (h) Help, (q) Quit resolution: d Possible repository destinations for moved-away 'branches\bug_2590_gradle\de.am_soft.sm_mtg.model\src\de' are: (1): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.api/src/main/java/de' (2): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model/src/main/java/de' (3): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.cmd/src/main/java/de' (4): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.oms/src/main/java/de' (5): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.ws/src/main/java/de' (6): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser/src/main/java/de' (7): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.cmd/src/main/java/de' (8): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.oms.post_proc/src/main/java/de' (9): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.oms.search/src/main/java/de' (10): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.packet/src/main/java/de' (11): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.packet.factory/src/main/java/de' (12): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.serializer/src/main/java/de' (13): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.serializer.record/src/main/java/de' Only one destination can be a move; the others are copies. Specify the correct move target path by number: 2 Select: (p) Postpone, (r) Mark as resolved, (m) Apply to move destination, (d) Set repository move destination path, (h) Help, (q) Quit resolution: m Tree conflict at 'de.am_soft.sm_mtg.model\src\de' marked as resolved. Summary of conflicts: Tree conflicts: 0 remaining (and 3 already resolved)
