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

Re: Merging two release of software project without central repository

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Sun, 2 Aug 2009 23:51:10 +0200


2009/7/30 Dedalus <ulysse_at_email.it>:
> I'm newbie of TortoiseSVN...
> I have this problem: I use tortoiseSVN for my local version of my
> software projects.
> I should collaborate with a friend because I'm go away from some days.
> I want export my folder project from my local repository. My friend
> import this folder in your repository (we haven't an http repository
> for now, only using file protocol). When I return I cant simply import
> folder with change that my collegue has make (in new folder in my
> repository) and after merge with my current working copy.
> It is exact?
> Thanks and sorry for my english.

How about:

1. create a new working copy from your repository (SVN Checkout) on
your filesystem.
2. zip the working copy and transfer it to your friend's PC
3. unzip
4. let your friend work on the files in that working copy (but without
commits or updates)
5. after you return, have him zip his working copy again
6. transfer the zip to your PC and unzip
7. commit his changes from the unzipped working copy
8. update your own working copy.

BTW This only works if you can live without commits for the few days
you are away...

.       ___
.  @@  // \\      "De Chelonian Mobile"
. (_,\/ \_/ \     TortoiseSVN
.   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
.   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-03 06:52:44 CEST

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.