I have a branch, (BranchA) and I want to re-integrate it into trunk.
but somehow, (almost certainly because of something I did), trunk is now a huge mess with 1000 of conflicts, (almost all of them 'tree' conflicts).
So now I want to merge BranchA into trunk, no questions asked, whatever file is in BranchA then it must be added/merged into trunk, whatever directory/file does not exist should be deleted.
Or, if I do a merge I want all the conflicts to be resolved with , "use theirs".
Even better would be to manually copy the files, delete whatever needs to be deleted and mark trunk as 'merged up' to branchA revision.
Does the trunk contain anything that you want to preserve that *isn't* on the branch? If not you could just replace trunk with branchA.
If the answer to the above is yes you could use svn resolve to accept all conflicts, then use reintegrate to merge the branch into the trunk.
nothing seems to work, svn is adement that I need to merge some old revisions and that's causing a bunch of conflicts.
I wish I could delete my trunk completely but every time I recreate it, svn wants to 'merge' something or other.
It would be great if I could tell it that it is merged up to a certain revision so at least it would not try to get some random versions that are causing a vast amount of tree conflicts.
I cannot even force a merge, (using 'theirs'), because I have to tree conflicts. So if I resolve using the working directory then the merge history seems to be lost somewhere and all the conflicts are ignored, including the '<<<<working' code.
if I try to do a dump of the repo, (to remove trunk once and for all), I get a "Serialized has missing terminator" after revision 213, and no obvious way of fixing that issue.