[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: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-07-17 23:39:19 CEST

Eric Hanchrow <offby1@blarg.net> writes:
> You know, that's true, but I've done it a couple of times and wound up
> _very_ confused. I can't remember why. I dimly recall Ben
> Collins-Sussman (one of the developers) agreeing that it's a bad idea.

I recommend you first copy your working copy BASE revisions to a
branch, switch to the branch, and commit them. That way you get
something that's much easier to diff (the other way, it's still
possible to get a diff of your changes, but it takes more work,
because you don't have a clean changeset to work with).

So:

   $ svn cp -rBASE -m "Create experiment branch." . http://.../branches/blah/
   $ svn switch http://.../branches/blah/
   $ svn st -q
    [... make sure your local changes are still there ...]
   $ svn ci -m "My experimental changes."

I haven't tested that, but it should work.

-Karl

-- 
Subversion support & consulting  <>  http://producingoss.com/consulting.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 17 23:38:43 2007

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