Ryan Schmidt - subversion-2006q2@ryandesign.com wrote:
> On May 26, 2006, at 23:36, Blair Zajac wrote:
>> Use svnmerge.py to make modifications in one location and merge them
>> to the other location:
>>
>> http://svn.collab.net/repos/svn/trunk/contrib/client-side/
>> svnmerge.README
>> http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py
>>
>> Its a very nice wrapper around the 'svn merge' command that keeps
>> track of revisions already merged over.
>
>
> More importantly, you should probably be reading the entire branching
> and merging chapter:
>
> http://svnbook.red-bean.com/en/1.2/svn.branchmerge.html
>
> Once you understand that and have been merging "by hand" for awhile,
> and if you decide that it's a bit tedious, then look into svnmerge and
> see if it makes things easier for you.
Thanks for the suggestions. I'll have a look at svnmerge. But now I'm
starting to think that I could get away with simply moving the stripped
files to a different directory. Probably not as nice to use, but a lot
simpler to administrate!
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 28 21:01:21 2006