Aidan Skinner wrote:
On Feb 8, 2008 10:04 AM, Rupert Smith <[EMAIL PROTECTED]> wrote:
So, presumably the C++ (python? ruby?) merged in cleanly from trunk, .Net
from M2.1, Java broker from M2.1 relatively ok, and all the nasty conflicts
were mainly around Java client? Sounds promising...
Pretty much.
What specifically are you trying to merge in c++? I had assumed that
only java needed real merging and for c++ (and probably python) we would
just continue with the trunk as is (with only particular fixes going to
M2 as needed by existing deployments).
