The bad news is that it's very easy to drift strategy is that by the time you're finished with your branch, it may be near-impossible to merge your changes back into the trunk without a huge number of conflicts.
Instead, you and Sally might continue to share changes as you work.
Checks are performed according to * the FORBID_MIXED_REV, FORBID_LOCAL_MODS, and FORBID_SWITCHED_SUBTREES * parameters. if all the FORBID_* parameters are TRUE, TARGET_ABSPATH must * be a single-revision, pristine, unswitched working copy.
If any checks fail, raise SVN_ERR_CLIENT_NOT_READY_TO_MERGE. * In other words, it must reflect a subtree of the repostiory as found * at single revision -- although sparse checkouts are permitted.
I'd like to propose that we disallow merges into mixed-revision workingcopies by default for 1.7, and only allow such merges if a special commandline option has been passed.
The reason for this is that merges into mixed-rev WCs can easily createconflicts which are tedious to resolve.
The "workaround" that I have found is to perform the merge operation on a clean copy of the trunk, after the SVN checkout of the trunk, without make any switch operation. Automatic reintegration merge cannot be performed in case your working copy is of mixed revision or has switched paths.
It's up to you to decide which changes are worth sharing; Subversion gives you the ability to selectively changes between branches.
And when you're completely finished with your branch, your entire set of branch changes can be copied back into the trunk.
Version: Neon.1 Release (4.6.1) Build id: 20160913-0900 Subversive SVN Team Provider 4.0.3.
I20161129-1700 SVNKit 1.8.14 Implementation (Optional) 6.0.3. I20161124-1700 SVN 1.9 I don't know exactly why there is this issue, but I noticed that it occurs if we perform some "switch" operations between branches before the Merge operation.