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

Re: First time use of merge reintegrate

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 20 Aug 2008 16:24:31 -0400

On Wed, Aug 20, 2008 at 4:14 PM, rjk1408 <rohanjoseph_at_gmail.com> wrote:

> Yes, that makes perfect sense now! But I seem to have run into another
> problem. I have the same use case as in my original post
> Trunk has foo with 1 line
> User 1 makes a branch off the trunk, makes changes in foo, merges from trunk
> and commits to branch
> User 2 makes a branch off the trunk, makes changes in foo, merges from trunk
> and commits to branch
> Now, its time to reintegrate.But instead, I create another branch off the
> trunk and call it 'merge-branch'
> I update the branches folder and get this new branch with the original file
> foo.
> and now run
> svn merge --reintegrate URL-to-Branch1 .
> I get an error:
> svn: File not found: revision 5, path '/branches/merge-branch'
> Revision 5 was when user 1 made a change in the foo file and committed to
> his branch.
> Why did this happen? Doesn't --reintegrate compare two URL trees ( and
> merge-branch cming from the trunk should make no difference right?)? Am I
> missing something here?

I do not know what the expected behavior is in that scenario. I'd
have expected the checks that reintegrate does to tell you that you
cannot use it (because it is meant to be used to merge to trunk, not
another branch). It could be that the checks themselves are running
into this error.

It sounds like a bug at some level because the error should either not
happen, or be caught and turned into a more specific error. At least

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-20 22:24:55 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.