Thanks for the info, I'll check into it.
I'm still trying to wrap my mind around subversion, the thought of a
different syntax is a bit troubling.
I suppose another option is monitoring files that have changed and
replacing them.
Still, I do like the idea of branches.
-eric
On Jun 13, 2007, at 10:42 AM, Arnauld Van Muysewinkel wrote:
> 2007/6/13, Eric Muzzy <emuzzy@amnh.org>:
>> I'm developing on two machines for the same project, each with their
>> own svn repository.
>> In the end, I want to merge into the repository at work but I'm not
>> sure how to do this.
>> In effect, I'm doing parallel development. When I do some work at
>> home I want to be able to merge the results back into the repository
>> at work. It would work the other way as well. The problem is that if
>> I copy the trunk from home, the .svn files are from a different
>> repository with a different url/path.
> [SNIP]
>
>
> Maybe you could consider using a decentralized version control system,
> like SVK [ http://en.wikipedia.org/wiki/SVK ], which is based on
> Subversion.
>
> --
> Arnauld Van Muysewinkel
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 13 19:16:49 2007