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
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
There's a few more people working on the p3yk branch now, I think (or at
least, there's been more work submitted than there used to :-), so I figure
it's time to explain about the p3yk branch again. I think I already said
most of these things once, anyway... it may have slipped my mind.
Developme
