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

Re: Darcs-style interactive commits,

From: Bob Proulx <bob_at_proulx.com>
Date: 2006-10-20 08:28:13 CEST

Ryan Schmidt wrote:
> Remko Troncon wrote:
> >What's even worse (and what I think makes it impossible to write as
> >a script) is that you might want certain changes in a file to be
> >committed, and others not.
> You shouldn't want that. :-)

I think it is okay to *want* it. :-)

> The reason you might want that is if you had made two sets of
> logically different changes in your working copy, and wanted to
> commit them separately.

What I do in this case is to create a diff of the working copy. Then
with the magic of Emacs diff-mode I reverse the hunks of the diff that
I want to remove and then apply them. As long as they are not in the
same hunk I can effectively remove sections that I don't want to
commit yet. Then after committing I can again reverse the diff and
apply putting those changes back in. And this does not even mention
emerge-mode, a force so powerful that it can only be used for ultimate
good or ultimate evil.

A little hard to describe but it actually works pretty well.

> Committing logically different changes separately is a good idea,
> but initially making those changes in a single working copy is not,

I sympathize with the original poster. Sometimes while fixing one
thing I get distracted with another thing that needs to be done


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 20 08:29:26 2006

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.