Re: Why am I getting a bad merge?
From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Sun, 20 Jun 2010 07:33:46 +1000
On Sun, Jun 20, 2010 at 2:24 AM, Steven Boswell II <ulatekh_at_yahoo.com> wrote:
Developers list is not an escalation point of the users@ list. Moving
> 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.
Are you trying to merge on that path explicity, or still merging on
> 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.
What is the output from the from the following commands:
svn mergeinfo --show-revs merged branch_folder
These will tell you (in a more readable format) the revisions that SVN
svn mergeinfo --show-revs eligible branch_folder
These will list the revisions that SVN thinks are available to be
This is an archived mail posted to the Subversion Users mailing list.