I have a repository with the standard branches/tags/trunk directory structure. The trunk contains some svnexternals stuff (not sure if that matters for this question, just pointing it out in case).
This is a brand new project where we haven't done a release to production yet, so this issue isn't as big of a deal as it will be in a few months.
I'm trying to merge [set of revisions] from our trunk (development) into our test branch. Right now, I'm getting the infamous merge info error. See here for more info. In order to get past this error for now, I'm DELETING the test branch, then re-creating it. But, this obviously is not a good way to go, especially after we start doing more and more builds and code moves to our test branch.
So...I've gone through all of the folders at the test branch level, as well as everything higher up and there aren't ANY mergeinfo properties set. In fact, the ONLY property I found that was set was my svnexternals, on one folder. From the link I put in above, one of the other options says to set the ignoreancestry option. My version of Tortoise defaults that already and it doesn't work.
Is there another approach to finding the mergeinfo property so I can remove it? Or, is there another way to ignore the mergeinfo property so I can get these merge's done instead of blowing away my branch?
Edit: By the way, I'm using Tortoise version 1.8.4.24972 (64-bit)
Edit2: I'm doing EVERYTHING from the TortoiseSVN Gui Client (aka I haven't done anything from command-line)
Edit3: Hi David, I don't do ANYTHING via command-line. Here's the steps that I've tried, and the error: Right-click "test" branch, TortoiseSVN -> Merge...Select "Merge a range of revisions". URL to merge from: ...../trunk, "Revision range to merge" = "all revisions". Ignore Ancestry is true. When I click ok, the error says: "Error, cannot merge automatically while ignoring mergeinfo"
Also, "how do I create the test branch?". If it already exists, I open the TortoiseSVN -> Repo browser. Navigate to the "branches" directory. In the right-side pane, right-click on the "test" branch, select "Delete" and give my comment "merge is hard for newbies". Next, go back to Windows Explorer where my source code is location. Right-click on "trunk", select "Branches/Tags...". Select the location to create the branch/tag, which is ../branches/test. Done.