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

Re: revert -keep?

From: Karl Palsson <kpalsson_at_cisco.com>
Date: 2003-08-09 23:15:12 CEST

>> Karl Palsson <kpalsson@cisco.com> writes:
>>
>>> In a clearcase uncheckout, you have the option of either removing or
>>> keeping your modified files. if you choose to remove, the behaviour is
>>> as per subversion, if you choose to keep, you get filename.keep and
>>> later .keep.2 and .keep.3 and so on.
>>>
>> You're not required to use 'svn revert' at all; it's a just a
>> convenience for removing local changes. It's not the same as
>> "uncheckout", because you never declared the edit to begin with. And
>> in a similar vein, you can just manually copy your changed files
>> elsewhere before running 'svn revert'.
>>
>
> I'd like to point out that the CVS equivalent command to 'svn revert' is
> 'cvs update -C filename'. This command *does* keep the modified copy
> around under a .#filename.version file. Offering the same thing in svn,
> while technically only a "convenience" for manually copying the files,
> is likely to prevent people being disappointed that their local changes
> were lost.
>

Ben, I see your point of the explicit checkout vs cvs/subversion style and
that's fine, I just personally find it odd that there are a number of mentions
of how subversion does its absolute best to guarantee no user data loss, and
then there's just revert that messes with that. (others opinions may vary of
course :)

With that in mind, would anyone object to a patch that adds a --keep-mods option
to keep all changes?

This would be in relation to
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=221423
and
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=161591

One of them suggests that the default be to --keep-mods, and then the default
could also be recursive,

I'd be quite happy to just have --keep optional, but if anyone has any serious
objections, then I'll keep it as my own change.

Of course, I spose this just got beyond users@

I am proposing that this only effect _files_ changed, not added or deleted, or
directories added or deleted. This is mainly for selfish reasons of not being
entirely sure how I'd want to keep mods of adds/deletes/moves.

Cheers,
Karl P

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 10 07:15:51 2003

This is an archived mail posted to the Subversion Users mailing list.