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

RE: Excluding files on branch from merging?

From: venome venome <venome_at_gmx.net>
Date: 2006-04-04 13:16:31 CEST

Apparently, svn:externals can only be used for directories, not files. So
not the right choice anyway.

> --- Ursprüngliche Nachricht ---
> Von: "Lakshman Srilakshmanan" <lakshman.srilakshmanan@tradingpost.com.au>
> An: "venome venome" <venome@gmx.net>, <users@subversion.tigris.org>
> Betreff: RE: Excluding files on branch from merging?
> Datum: Tue, 4 Apr 2006 09:52:52 +1000
>
> Hi,
>
> I think you need to investigate svn:externals. I have never done this
> myself.
>
> Ref: http://svn.haxx.se/users/archive-2005-09/0671.shtml
>
>
> Thanks
> Lakshman
>
>
> -----Original Message-----
> From: venome venome [mailto:venome@gmx.net]
> Sent: Monday, 3 April 2006 8:43 PM
> To: users@subversion.tigris.org
> Subject: Excluding files on branch from merging?
>
> (Hi. I'm rather new to working with version control, and, of course,
> delighted with it.)
>
> Now I have a problem I couldn't find covered in the SVN book. The
> situation:
> I have a set of HTML templates in my trunk, which I'll call the "default
> skin" for my web app. Then I have a "customer-specific skin", which
> contains
> exactly the same files, a few of which have been changed, and even fewer
> have been totally replaced by different code.
>
> I understand that for such layouts, you should create a branch (which
> will
> exist forever, without ever being merged back into the trunk). Now when
> I
> make changes in the trunk, most files in the branch should be
> updated/merged
> to these changes, but the few files that are totally different should
> not be
> affected by this, they're not mergeable anyway and I suppose I will just
> have to adapt them myself when the trunk is changed.
>
> However I was not able to find out how to exlude specific files from
> being
> merged/updated. Adding them svn:ignore would do the trick, but then
> changes
> to the ignored files wouldn't be committed either. Setting locks seems
> not
> what I want. Has anybody got a suggestion for me?
>
> --
> "Feel free" - 10 GB Mailbox, 100 FreeSMS/Monat ...
> Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

-- 
Echte DSL-Flatrate dauerhaft für 0,- Euro*!
"Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 4 13:17:41 2006

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.