Thank you, that seems to be a usable workaround. I'll probably create a
little shell script to do that.
> --- Ursprüngliche Nachricht ---
> Von: "Andrew Goodnough" <Andrew.Goodnough@wicourts.gov>
> An: "venome venome" <venome@gmx.net>, <users@subversion.tigris.org>
> Betreff: Re: Excluding files on branch from merging?
> Datum: Mon, 03 Apr 2006 11:36:05 -0500
>
> We also had the need to exclude specific files from the merge so here's
> what I did. We automated these steps in a Python script but it would be
> easy enough to do manually as well.
>
> 1) Perform the SVN merge //this will merge files you do and don't want
> merged into your *working* directory
> 2) SVN Revert the files/directories that you don't want to be affected
> by the merge (might need to do a SVN Resolve on some of them)
> a) I do a file-system delete and then an SVN update but I think
> revert is more the SVN way
> 3) Commit the merged files //the reverted files/dirs will not be part
> of the commit and will remain as they were
>
> Andy
>
> >>> On Mon, Apr 3, 2006 at 5:42 am, in message
> <31506.1144060965@www041.gmx.net>,
> "venome venome" <venome@gmx.net> wrote:
> > (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?
>
--
Analog-/ISDN-Nutzer sparen mit GMX SmartSurfer bis zu 70%!
Kostenlos downloaden: http://www.gmx.net/de/go/smartsurfer
---------------------------------------------------------------------
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:20:34 2006