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

Re: Supporting satelite development laptop

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-01-22 22:11:45 CET

Chris wrote:
> Stefan Küng <tortoisesvn@...> writes:
>> You could use a private branch for this. Then the user can commit his
>> changes without interfering with the main development. The private
>> branch would be used as a 'sync-branch'.
>> Stefan
> Would you then "merge" the sync-branch back in to the main trunk when you
> want to do a commit?

* working copy with modifications, pointing to trunk
* branch/tag "from working copy" to e.g. /branches/user/22.01.2007
* on laptop, merge from trunk to branches/user/22.01.2007 into working copy
* work on laptop
* branch/tag "from working copy" (on laptop) to branches/user/23.01.2007
* on main computer, merge from branches/user/22.01.2007 to
branches/user/23.01.2007 into working copy.

Or: export the whole working copy, copy it over to the laptop
overwriting all the files. When back, do the same in reverse.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Jan 22 22:12:02 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.