Stefan Küng <tortoisesvn@...> writes:
> Chris wrote:
> > Stefan Küng <tortoisesvn <at> ...> 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.
This seems to be working well. Thank you very much for the help.
1) When creating a temporary branch from the main development machine as
described by Stefan above, make sure you select "Working copy" as the source
and also do NOT select "Switch working copy to new branch/tag". This way
your dev source stays referenced against the trunk and commits will be
applied to the trunk.
2) When promoting changes from your satellite laptop, changes can be
committed back to the same temporary branch. When merging, you can select
the two revisions of the temporary branch as the source of the merge. This
is neat because you can easily see just the changes from the laptop being
3) An alternative method which is quicker but not as effective at merging
changes is to create a patch on the dev workstation and apply the patch to
the laptop. context - TortiseSVN - Create Patch... and Apply Patch... This
can also be used to move changes from the Laptop back to the dev desktop.
The merge process is different for patches so you don't have the same
conflict resolution solution as you do with branches.
Again, thanks for the help.
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Wed Jan 24 07:33:40 2007