|
Boost : |
From: David Abrahams (dave_at_[hidden])
Date: 2007-09-06 09:12:16
on Thu Sep 06 2007, Roland Schwarz <roland.schwarz-AT-chello.at> wrote:
> David Abrahams wrote:
>
>> What is your argument against using svnmerge.py before svn 1.5 is
>> available?
>
> May I dare to ask an innocent question?
> Would users of gui tools such as TortoiseSVN also need to use this
> tool?
Yes, we would strongly encourage it.
> Would it be usable together with Tortoise?
I think all the information is here:
http://www.orcaware.com/svn/wiki/Svnmerge.py
You can surely use it "with" Tortoise, but I think you can only do
merges from the command line if you want to get maximum benefit and
avoid confusing other peoples' merges.
-- Dave Abrahams Boost Consulting http://www.boost-consulting.com The Astoria Seminar ==> http://www.astoriaseminar.com
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk