Aidan, what is the scope of the merge so far? Just java broker, all java, or all?
On 07/02/2008, Aidan Skinner <[EMAIL PROTECTED]> wrote: > > Yo, > > That humongous commit message that's going to be spamming qpid-commits > shortly represents Phase 1 of an N Phase merge program. Everything on > that branch now builds, although the unit tests don't pass yet. I'll > fix that tomorrow, I have to run to class now but wanted to get this > in there so I can get back to tracking trunk and M2.1 into that. > > If you've done any work on trunk or an M2 branch since they diverged, > it would probably be a good idea to check that it's still there. I did > my best, but there's only so much tooling, kdiff and one vdiff > implementation can do. > > Love, > > Merge Master Mike > -- > aim/y!:aidans42 g:[EMAIL PROTECTED] > http://aidan.skinner.me.uk/ > "Almost everything is imitation... The most original writers borrowed > from one another." - Voltaire >
