merge from trunk to branch chooses wrong target
GoogleCodeExporter opened this issue · comments
What steps will reproduce the problem?
1. Create a new branch "branch1"
2. Create a tag branch "tag1"
2. change and commit something in trunk
3. use svnX to merge from the trunk to branch "branch1"
What is the expected output? What do you see instead?
It was expected that the changes committed to the trunk would be merged with
the current state of branch1. What actually happened was the changes in trunk
were merged to the working copy of tag1.
What version of the product are you using? On what operating system?
svnX: 1.3.4
svn: version 1.8.8 (via homebrew)
OS: OS X 10.9.3
Please provide any additional information below.
Original issue reported on code.google.com by rufe...@gmail.com on 13 Jun 2014 at 4:29
Attachments:
- [svnX merge problems.pdf](https://storage.googleapis.com/google-code-attachments/svnx/issue-213/comment-0/svnX merge problems.pdf)
Your screen shots show that the target will be “tags/1.3.0/trunk” in your
WC. So I think it’s behaving as expected.
SvnX searches in multiple ways for a reasonable match for the source URL.
But, I don’t think that svnX 1.x considers the selected tree-view directory.
If the source URL is a directory then svnX searches the selected items for a
(versioned) directory first.
Try changing the tree-view directory to the parent of the required target
directory (patch_store/branches) and then selecting the required target
directory (kel-error-scraper) before dragging the source URL.
[SvnX 2 will have (has) an improved search algorithm.]
Original comment by chris...@gmail.com on 13 Jun 2014 at 5:34
[deleted comment]
Thanks, that seems to work for what I need.
Original comment by rufe...@gmail.com on 18 Jun 2014 at 3:44
Original comment by chris...@gmail.com on 24 Aug 2015 at 7:05
- Changed state: Invalid