[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: Path not found on merge

From: Thomas Kopp <tkopp_at_vertere.com>
Date: Mon, 6 Apr 2015 21:14:48 -0700 (PDT)

> On Mon, Apr 6, 2015 at 6:21 PM, Thomas Kopp <tkopp at vertere dot com> wrote:
> >
> > Last week we merged our production branch into the open issue branches we
> have. There were no conflicts and only a few files changed in most cases.
> >
> > Today after changes in two of the open branches, I copied the production
> branch to a new Next Release branch, checked it out to my local machine,
> then attempted to merge the two open branches into the local copy. The
> test merge listed a number of tree conflicts and other potential conflicts,
> and when I try to do an actual merge it transfers some data then gives a
> path not found error with a revision number in the form:
> >
> > 'svn/[repository name]/!svn/rvr/[revision number]/[path to branch]' path
> not found
> >
> I saw the same error message, when I had this situation:
> 1. Create branchA from trunk at revision 123
> 2. Do some work on branchA, up to revision 124
> 3. Revision 125 created on trunk
> 4. Merge revision 125 to branchA
> 5. Create branchB from revision 125 on trunk
> 6. Merge branchA to branchB as an automatic merge, by not specifying a
> revision
> I worked around this issue by specifying an explicit revision range in step
> 6 instead of doing an auto merge. But I'd certainly like to know what was
> going on.

Hi Fritz;

Your comment gave me an idea... the revision number that was listed as "not found" was 6790. When choosing individual revisions from the log for the merge, I noticed that the revision for when I'd merged the production branch into the open branch was revision number 6791. So when merging I chose all revisions to the open branch except 6791. I still got tree conflicts that I had to mark as resolved, but after that the actual merge succeeded without giving me the "not found" error. I then merged all the revisions of the other open branch. I got some similar tree conflicts and SVN treated some code as conflicting that I would normally expect it to recognize as "merge-able", but after manually resolving those that branch also merged successfully.

I think our cases were a little different, in that I was trying to merge each open branch back into the trunk, but you gave me the idea of where in the revision log to look for the issue. Thanks!


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-07 06:14:56 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.