Re: Incorrect merge

[Stefan Monnier]

>> > Suggestions are welcome.
>> I don't think there are magic bullets.
> In Python, they have a script called svnmerge.py.  This script did
> many things, one of them was to keep track of blocked revisions, ie,
> revisions that should not be merged to trunk (or to some given branch,
> IIRC).

Indeed, the only way I can think of to try and make sure such undesired
merges don't happen is to try and encode this fact into a merge script.
Having such a merge script is a good idea in any case since it can help
resolve the ChangeLog conflicts as well (they tend to require a lot of
work, but most of it can be automated).


        Stefan