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

Re: merge two local working copies

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2007-07-13 17:32:10 CEST

>>>>> "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

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
Received on Fri Jul 13 17:37:59 2007

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