On 5/23/06, Scott Morris <scott@4mation.com.au> wrote:
> Lübbe Onken wrote:
> >
> > That would work, but all his patches would be against the "initial
> > checkout". If you change anything he will soon get out of sync. So you would
> > have to e-mail him your changesets as well. If weekly/daily snapshots are
> > "good enough" for him, you can go this way until you set up your server.
> >
> > Cheers
> > - Lübbe
>
> OK so the steps I should follow are.
>
> 1. Ask him to install tortoiseSVN
> 2. Create another checkout, zip it up and send it to him
>
> 3. He makes modifications over the weekend, creates a patch, sends it to me
> 4. I apply the patch to the repos, and continue working on it during the
> week.
> 5. At the end of the week I create a patch and send it to him.
> 6. He can apply that patch on HIS wc?
> 7. and the cycle continues..? (ie back to point 3)
Well, really at this point it's almost pointless for him to use a true
working copy (at least a WC pointing at your repository) and TSVN, if
he's never going to connect back to your repository.
1. Export a copy on your end, zip it up and send to him.
2. He unpacks twice - once to a "pristine" copy, once to a "working" copy
3. He does work in the working copy.
4. When ready to send work to you, he performs a diff between the
pristine and working copies. He sends the resulting patchfile to you
(GNU diff has been ported to Win32 command line).
5. You apply the patch to your WC and commit.
6. When you have an update for him, you create a patch from your WC
using the revision created in step 5 as the "base" revision and send
this patch to him.
7. He applies the patch to his WC, then copies that immediately to the
pristine copy (assuming he's made no changes since sending you a
patch), and continues work in his WC.
Or maybe I'm way off here?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 24 02:25:32 2006