[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: Ryan Schmidt <subversion-2006d_at_ryandesign.com>
Date: 2006-10-19 22:03:37 CEST

On Oct 19, 2006, at 14:46, Ed Price wrote:

>> - I am working on a bigger change, and all of the sudden find out
>> some bug that needs fixing. Instead of doing a fresh checkout, re-
>> compile the whole project (which can take hours), fix the bug,
>> commit, erase the working copy, i can just work on my precompiled
>> working copy, fix the bug, and commit the small fix.
>
> For my most active projects I very often have multiple WCs.
> One is typically a "pristine" trunk checkout.
> To make a small fix, I sometimes temporarily use that one.
> Even though that makes it unpristine :) it's a small fix so very
> brief...
>
> BTW, don't you *want* people to make sure the project still builds,
> passes its testsuite etc. before checking in a fix? :) But
> half-jokes aside, here is how I often do what I think you are
> describing:
>
> Say I have a complicated project with "a", "b", "c", ... "z" modules.
> And I've been making non-trivial changes to all of them.
> Then I find some trivial unrelated thing I want to fix in module "m".
> Here's what I do to make the change separately:
>
> mv m m.save
> svn up m
> # edit "m" for trivial fix
> svn ci m -m "trivial fix"
> rm -rf m
> mv m.save m
> svn up m
>
> I take advantage of svn's "detachable" working copy directories
> all the time...

You can also copy the entire working copy, compiled objects and all,
to another place ("cp -RPp wc1 wc2"), revert all the changes you had
made ("svn revert -R wc2", then manually remove any unversioned files
located with "svn st"), and then make the trivial change, and then
compiling might not take so long. (I'm not sure because I work with
PHP projects so I've never had to deal with a compile phase.)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 19 22:04:33 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.