qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Rupert Smith" <rupertlssm...@googlemail.com>
Subject Re: M2 -> Trunk Merge Complete
Date Mon, 17 Sep 2007 15:23:48 GMT
On 30/08/2007, Martin Ritchie <ritchiem@apache.org> wrote:

> There was a lot of file movements in the integrationtest/systest
> packages. I believe I have all the changes but if those more intimate
> with these tests could verify then that would be great.
>


I changed my mind a lot whilst writing these!

You've got the changes merged onto trunk, mostly fine. There are one or two
things that slipped through, but I will copy them accross by hand just now.

I notice that svnmerge avail -S ../../branches/M2, still reports a list of
available changes to merge:

561794,561855,562059,562066,562083,562124-562125,563434-563435,563440,563496-563497,563528-563529,563532,563986,564593,564618-564619,565284,
565703,566643-566644,566665,567003,567006,567062-567064,567074,567083,567567,567727,567740,568141,568148,568165,568187,574873,574876,575253,
575663,575688

Are these all changes made after your big merge? In which case they should
be merged too. Or if they have already been done, I will mark them as so.

Now that M2 branch is pretty much closed, should we turn on svnmerge
tracking for M2 -> M2.1 (criticial fixes to M2, merged into M2.1) and for
M2.1 -> trunk (more siginificant post M2 work copied onto trunk)?

Rupert

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message