On 7/13/07, Eric Hanchrow <offby1@blarg.net> wrote:
> >>>>> "Jason" == Jason Winnebeck <jpwasp@rit.edu> writes:
>
> Jason> What I don't know is the ideal commands if modifications
> Jason> are already made
>
> If I'm understanding you correctly, your situation looks like this:
>
> * you check out a wc
>
> * hack hack hack
>
> * time to go home
>
> * "Boy I wish there were an easy way to get these uncommitted changes
> to my home machine ... but since I'm hacking on the trunk, not a
> branch, I'm screwed".
>
> At this point, you can make a branch anyway! Just figure out what the
> "base" revision is of your wc -- that is, the revision that you
> checked out:
>
> $ svn info | egrep ^Revision
> Revision: 1234
>
> Now make an after-the-fact branch _of that revision_:
>
> $ svn cp -r1234 svn://server/repos/path/to/trunk
> svn://server/repos/path/to/branches/private-at-home-hacking-branch
>
> Switch your wc to it:
>
> $ svn switch
> svn://server/repos/path/to/branches/private-at-home-hacking-branch .
>
> You will _not_ get any conflicts.
>
> Commit, go home, check out that branch, and continue hacking.
>
> --
> Rarely do we find men who willingly engage in hard, solid
> thinking. There is an almost universal quest for easy answers
> and half-baked solutions. Nothing pains some people more
> than having to think.
> -- Martin Luther King, Jr.
> from "Strength to Love," 1963.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
And easier way to do this (and still make sure you don't pick up any
changes from trunk that you don't want yet) is to simply copy your
working copy straight into the task branch. Using Erics naming
conventions:
svn cp . svn://server/repos/path/to/branches/private-at-home-hacking-branch
I also presume that you won't actually need to switch your working
copy at work...just merge into it when you get back the next day. Any
changes you made before will merge cleanly because they are the exact
same change.
Troy
--
"Beware of spyware. If you can, use the Firefox browser." - USA Today
Download now at http://getfirefox.com
Registered Linux User #354814 ( http://counter.li.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 16 04:37:35 2007