[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-12-05 14:49:42 CET

On Dec 4, 2004, at 10:51 PM, trlists@clayst.com wrote:

> But will also remove any local edits I do want if I had to resolve
> conflicts, right?

Correct. There's no magic command to separate "good" local edits from
"bad" local edits. A human has to do that: that's why svn gives you
conflict markers (to demarcate the old vs. new edits) and 3 fulltext
files (so you can use a 3rd party tool to merge).

>> Of course, you can undo edits just by editing them away: remove a
>> text change in your editor, or remove a propchange by running 'svn
>> propset' or 'svn propdel'.
> OK, so the propset to reset svn:ignore is the right way to do things in
> this case.
> Again just for my learning, there is no way to revert a property change
> and nothing else, is there?

No, there's no way to make 'svn revert' only revert text, or only
revert props. You'll have to use 'svn propset' or 'svn propdel' to
undo the change.

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