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

[John Anderson]

On Wed, 2007-02-14 at 12:39 +0100, Gerd Flaig wrote:
> I suggest explicitly specifying the last merge to branch revision as
> the trunk base revision for the merge to trunk, like this:
> 
> % svn merge svn+ssh://ardoursvn@ardour.org/ardour2/trunk@1449 svn+ssh://ardoursvn@ardour.org/ardour2/branches/surfaces
> 
> If this produces too many conflicts to be practical, you might want to
> try merging the trunk changes from 1449 to the current revision into
> the branch and merging to trunk afterwards. There have been changes in
> the last two days.

I did a fresh checkout of trunk, and then did the command above. The
diff is at

http://www.semiosix.com/surfaces.diff

bye
John