At regular intervals, I get a new version of the vendor software, delivered as source code in a compressed package, and I do not have access to the provider source repository. We make changes to the vendor source code between their releases. Our changes are not included in their releases, but I need to combine the changes from my releases into my main line.
My repository layout is as follows:
- / branches / Vendor X release 1.0
- / branches / Vendor X release 1.1
- / trunk /
The sequence of work that I performed was:
- I added Vendor X release 1.0 as a branch, and then copied it to the tooltip.
- We made some changes to the source code on the trunk, and then got Vendor X release 1.1 .
- I added Vendor X release 1.1 to the branch. Now I would like to combine Vendor X release 1.1 into a trunk.
The problem that I am facing is that no matter how I do it, I get either a merge, as a result of which there are no changes in the trunk, or each file is reported as a tree conflict.
I think I would like to do the following somehow: tell Subversion to merge each file without regard to the version number of the file. I think Subversion reports a tree conflict for each file because the files did not come from the same point in the change history. However, in many cases, these files are identical.
.