Another Merge Question.

[Gavin Baumanis <ga...@eclinic.com.au>]

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

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.

But the release file included all changes made prior to r9253 as well.
Now, indeed the state of the file @9253 does contain about a dozen  
extra commits/changes that were made since the file was committed to  
the release branch @r8192.
But I don't care about any changes that occurred to the trunk/....  
between 8192 and 9252

I'm sure it should be an easy enough task - but I am simply not having  
that light-bulb moment.
Could someone please point me in the right direction?

(Oh BTW I am using the command line. - or at least trying to!)
Thanks - Gavin.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2401193

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

RE: Another Merge Question.

[Bob Archer <bo...@amsi.com>]

> 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@9252 \
          project1/trunk/myDirectory/fileName.txt@9258 \
          project1/branches/released/myDirectory/fileName.txt

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?

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2401240

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].