On Thu, Dec 10, 2009 at 08:08:31PM +0100, Tobias Hahn wrote:
> I recognize that I meet some resistance here to my proposal...
>
> So what about a command svn stash (shamelessly stolen from git-stash)
> then? Example:
>
> $ svn stash save "Some dirty changes."
>
> This would add new files, save all local modifications away and then
> revert --force the tree. At this point the wc would be clean, so I
> could
>
> $ svn merge -r ...
> $ svn commit -m "Merged -r ... "
>
> Later, I would be able to either
>
> $ svn stash pop
>
> if I decide my changes were important or do nothing if not.
>
> I realize that the way git handles repos makes this feature
> particularly easy for them to implement, but it should be possible for
> svn as well.
>
> Would this constitute a less controversial feature request?
Local stashing and similar ideas such as offline commits have been
discussed between developers. But they won't happen until after 1.7
release. We need to get the core of the new work-in-progress working
copy library rock solid and released before we can add new sugar coating
features.
Note that you can already stash your local changes away into the repository:
$ svn cp -m "some dirty changes" . ^/stash/tobias/some-dirty-changes
As for your revert --force suggestion, the name --force is not descriptive
and can mean different things depending on the subcommand used, so we have
been discouraging new use of this option. And I don't think the revert
command is a good place for this functionality. I'd rather want something
like:
$ svn cleanup --remove-unversioned-files
since that is independent of reverting local modifications to
versioned files.
If you want this really soon now, please try writing a patch.
It does not need to be perfect, we can help you bang it into
shape if you post an initial working version to dev@.
Thanks,
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2429717
Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-12-11 11:39:21 CET