Cannot reintegrate into mixed revision working copy try updating first dieter sprockets dating game
Hello, I'm trying to do a remote-URL/remote-URL merge (for vendor drops) into my working copy which contains externals (for the binaries).When both are updated to HEAD and I try to do the merge, I get this error message.That is, you'll always need to use the detailed merge syntax to specify specific ranges of revisions to replicate (see the section called “Merge Syntax: Full Disclosure” later in this chapter), and take special care to keep track of what's already been merged and what hasn't. Prior to this feature keeping track of merges required cumbersome manual procedures or the use of external tools.Subsequent releases of Subversion introduced many enhancements and bug fixes to merge tracking, which is why we recommend using the most recent versions for both your server and client.So, the good news is that you and Sally aren't interfering with each other.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.
Now, to avoid accidentally trying to merge these same changes into your branch again in the future, you'll need to record the fact that you've already merged them. One of the simplest places to record this information is in the log message for the commit of the merge: revision that's already been merged in from the trunk.For our purposes, let's say that a changeset is just a collection of changes with a unique name.The changes might include textual edits to file contents, modifications to tree structure, or tweaks to metadata.Is there a cleaner way around this or am I doing something wrong?Now you and Sally are working on parallel branches of the project: you're working on a private branch, and Sally is working on the trunk, or main line of development.
And when you're completely finished with your branch, your entire set of branch changes can be copied back into the trunk.