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

Merge Behaviour.

From: Gavin 'Beau' Baumanis <beau_at_palcare.com.au>
Date: Fri, 20 Feb 2009 12:43:07 +1100

Hi Everyone,

In the sense of there are no stupid questions.... please find below my
stupid question!
What is the expected behaviour of svn merge?
I have two files

/trunk/directoryA/file1
/trunk/directoryB/file3

using the following command;
svn merge -r 1234:head /trunk/directoryA/file1 /trunk/directoryB/file3

I expected all changes that were made file1 from revision 1235: head
to be placed into file3.

What I have found in file 3 is is in fact the contents of file 1.
Ie. lines in file 1 that were NOT changed in the revision range
specified in the merge, were merged into the destination file if the
lines were different between src and dest.

If this is Normal behaviour it certainly isn't what I expected. - I
expected just the changes, alone, to go to the destination.

using svn --version I receive;
svn, version 1.5.2 (r32768)

The Repository is also 1.5.2

TIA for any help you might be able to provide.

Gavin

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 05:47:17 CET

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