[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: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-07-13 22:32:14 CEST

On Jul 13, 2007, at 08:32, Freek Dijkstra wrote:

> I find myself doing to following a lot:
> 1. Check out a repository, make changes at work
> 2. Manually see what I changed, and copy those to my home computer
> 3. Go home
> 4. Continue editing at home
> 5. Do a commit
> So I do not commit at step 2, and update at home. That would of course
> be a lot easier for me! The reason I do so clumsy is because my
> yet-unfinished change would break stuff of a few colleagues.
> Is there a smarter way to do this, than to manually do a diff -r --
> brief
> and copy the changed files between my two local computers? I looked at
> svn merge, but that only seems to be able to merge changes between two
> revision to a local working copy. What I want is to merge the
> difference
> between HEAD and whatever I had at the working copy at work to the
> working copy at home.

Everybody else has suggested you commit your changes to a temporary
branch. But the first thing that popped into my head was: just take
the working copy home. Copy your working copy from work onto a USB
stick or iPod or laptop, bring it home, continue working, commit when
you're ready.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 13 22:31:46 2007

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.