Thomas Wouters wrote:
> Merging with svnmerge has a big consequence: changes that are applied to
> both the trunk and the p3yk branch are hell.
You do know you can use svnmerge merge --record-only, cherry-picking the
changes that have been applied on both branches, and then use a single
svnme
On 12/13/06, Giovanni Bajo <[EMAIL PROTECTED]> wrote:
Thomas Wouters wrote:
> Merging with svnmerge has a big consequence: changes that are applied to
> both the trunk and the p3yk branch are hell.
You do know you can use svnmerge merge --record-only, cherry-picking the
changes that have been
