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

RE: Understanding copying/replacing

From: Gareth Lennox <gareth_at_dwakn.com>
Date: 2004-01-16 21:32:38 CET

> Does this allow you to leave certain files that may have been
> customized?
> In other words is there a way to do this to individual files
> or do you have
> to do it a directory at a time?

As far as I understand it (correct me if I am wrong, anyone), when you
perform a merge, subversion only merges changes that have ocurred in the
revisions you specify, it does not merge files that have not changed in
those revisions. You can do this for entire directories at once as well.

I just did a small test (to check that you can keep customised files):

branched the trunk
made a change in the branch
made a change in the trunk (same file)
merged from trunk to branch (using the revision I created the branch:HEAD)

Subversion merged the files, keeping both changes (in the branch). Obviously
this would conflict if I had changed the same lines in the file. So
therefore you can branch the trunk and customise it, later merging changes
from the trunk and keep your changes in the branch.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 16 21:34:03 2004

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.