[ardour-dev] Help with merge to trunk from surfaces

[Gerd Flaig]

John Anderson <ardour at semiosix.com> writes:

> Thanks! That worked - no conflicts.

great.

> So for future reference, if I say
>
> svn merge F T
>
> svn will find the diff necessary to get from F to T, and apply the diff
> to the local working directory?

yes. By the way, there's also the form 'svn merge A B working-dir',
which merges the diff between A and B into the specified working
directory 'working-dir'.

     Goodbyte, Gerd.
-- 
The last thing one knows in constructing a work is what to put first.
                -- Blaise Pascal