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

Re: Directory Merges and svn:ignore

From: <trlists_at_clayst.com>
Date: 2004-12-05 04:38:20 CET

On 4 Dec 2004 Ben Collins-Sussman wrote:

> If you tell 'svn merge' to merge a whole directory, there's no way to
> have the command pay attention to some differences and ignore others.
> The merge command is really very simple: "compare two trees, and apply
> the resulting patch to my working copy". No filters, no fancy
> switches, no frills.
> However, since the result of 'svn merge' is a bunch of local edits in
> your working copy, you're free to review and undo any number of the
> changes, before you commit.

Fair enough, it's doing exactly what it's designed to do. Just not
what I want it to do :-). It seems to me that the svn:ignore property
for a directory might often be something one *doesn't* want merged, but
I get that the code can't cover every case.

So the undo is just to do the reverse merge command on that one item?
For a directory, can I do it by doing a reverse merge on the directory
name, with -N to avoid also doing the files? It doesn't look like
there's any way to do just the property, which is what I'd really want.
It's an academic point in this case -- I keep the ignore list in each
directory in a text file and can reset it easily with propset -- but
I'm just trying to keep creeping up the learning curve :-).


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 5 04:39:54 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.