[fpc-devel] Potential merge conflict in r15401

[Jonas Maebe]

On 10 Jun 2010, at 14:41, Graeme Geldenhuys wrote:

> My knowledge of SubVersion has degraded rapidly. Could somebody with more
> knowledge/confidence of SVN bring cpstrnew branch in sync with Trunk.

The merge commands are very simple:

svn merge <path to trunk> (either an url or a local checkout)
<resolve conflicts>
svn resolved <files that had conflicts>
svn ci

The harder part was resolving the conflicts. The merged version has been committed in r15421, I hope that I didn't break anything (I only checked make cycle on Darwin and cross-compiling the win32 rtl).


Jonas