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

Re: Excluding files from merge

From: Gary Thomas <gary_at_mlbassoc.com>
Date: 2005-04-04 17:43:27 CEST

On Mon, 2005-04-04 at 10:38 -0500, SuiterM@insession.com wrote:
> This is my first post here, so hopefully I'm doing it right.
> We just converted from VSS to SVN last week and still have a lot to
> learn. We have our main development at /trunk. We have our latest
> release at /branches/wp332. Bug fixes are made to /branches/wp332 and
> merged into the trunk and that works just fine. We have about 5 files
> that are both in /trunk and /branches/wp332 that I want to keep
> separate copies. So, when I do a merge from /branches/wp332 to /trunk,
> I don't want these 5 files merged.
> Is there a way to do this? If not, any suggestions on what to do?

Do the merge into your WC. Then simply revert the 5 files that
you don't want to change in your WC before you commit.

Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 4 17:47:28 2005

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.