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

RE: Another Merge Question.

From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 28 Sep 2009 10:13:18 -0400

> Hi Everyone,
> I'm obviously not getting it... because merging just isn't working for
> me.
> I have a file;
> project1/trunk/myDirectory/fileName.txt
> it is @r9258
> I have a release branch for the same project and thus have
> project1/branches/released/myDirectory/fileName.txt
> it is @r8192
> There have been several previous updates to the file but only the
> changes from 9253:9258 are approved to go to production.
> I ran the following command;
> svn merge -r 9252:9258 project1/trunk/myDirectory/fileName.txt
> project1/branches/released/myDirectory/fileName.txt

What is the result of this command? I expect that this is not merging other stuff automatically based on merginfo. It shouldn't do that. What version of svn client/server do you have?

Try it this way:

svn merge project1/trunk/myDirectory/fileName.txt_at_9252 \
          project1/trunk/myDirectory/fileName.txt_at_9258 \

If that doesn't work, perhaps use the URLs rather than the WCPaths.

> But the results I got were not what I expected.
> I had assumed that I would get all changes made in r9253 through to
> r9258 applied to the file in the release branch - but ONLY the changes
> made in those revisions.

Yes, that should be correct. Did you verify what you think is there is there. You can get the 9252 rev and the 9258 rev and compare them manually. Maybe one of those commits has something you didn't think it had?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-28 16:14:09 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.