Re: Why am I getting a bad merge?

On Sun, Jun 20, 2010 at 2:24 AM, Steven Boswell II <ulatekh_at_yahoo.com> wrote:
> (I asked this question almost a month ago on the users list, but got no response, so now I'm trying the developers list.)

Developers list is not an escalation point of the users@ list. Moving
back to the users@ list now ...

> I recently began using Subversion to track a project at the new company where I work.  We've been using it for a few weeks, and our database has just over 60 commits to it now.
>
> I created a "release" branch of the project at revision 36, and have been doing heavy development in the trunk, merging only the bug fixes into the branch.  It now looks like my trunk changes are fine, and I wanted to merge them into the release branch, but that's where things went wrong.  Most of the files were fine, but one file missed a very large change!
>
> In the branch, that file had a change at revision 62, and as mentioned above, the branch was created in revision 36.  In the trunk, that file was modified in revisions 61, 59, 37, 23, and points earlier.  The single merge of that file into the branch was done with "svn merge -r61:62 <path>", run on the parent directory.  When I try to merge the trunk version of that file into the branch, I get:
>
> --- Merging r47 through r62 into '<filename>':
> U          <filename>

Are you trying to merge on that path explicity, or still merging on
the parent directory?

> As you can see, it skips the change to the file made in revision 37!  Specifying "-r36:62" in the command line gives the same result.  I'm not even sure why it's mentioning revision 47, because the file wasn't changed then.
>
> "svn propget svn:mergeinfo --depth infinity <branch file>" shows nothing, not even the merge from "-r61:62".

What is the output from the from the following commands:

svn mergeinfo --show-revs merged branch_folder
svn mergeinfo --show-revs merged branch_file

These will tell you (in a more readable format) the revisions that SVN
belive have already been merged.

svn mergeinfo --show-revs eligible branch_folder
svn mergeinfo --show-revs eligible branch_file

These will list the revisions that SVN thinks are available to be
merged. If r37 is not being merged, then it should be listed in one of
the first two commands.

<snipped />
Received on 2010-06-19 23:34:46 CEST