qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Martin Ritchie" <ritch...@apache.org>
Subject Re: M2 -> Trunk Merge Complete
Date Mon, 17 Sep 2007 21:48:48 GMT
Rupert,

The svnmerge tracking was all messed up when the first merge was
backed out but the svnmerge changes were left in. I'm less convinced
about its abilities as a suitable change tracking device across all
the branches we now have(M2, M2.1, trunk). Perhaps we need a less
technical and a more sociological solution.

On 17/09/2007, Rafael Schloming <rafaels@redhat.com> wrote:
> Rupert Smith wrote:
> > I will merge all outstanding changes from M2 to trunk soon. Can the authors
> > of the following changes please indicate whether or not they are to be
> > merged? (All of the other changes are test stuff that I was working on).
> >
> > Rupert
> >
> > ------------------------------------------------------------------------
> > r575688 | rhs | 2007-09-14 15:04:38 +0100 (Fri, 14 Sep 2007) | 1 line
> >
> > Merged revision 572751 from the trunk, this fixes QPID-573.
>
> This was a merge from the trunk to the branch, so you don't need to
> merge this one.
>
> > ------------------------------------------------------------------------
> > ------------------------------------------------------------------------
> > r563986 | rhs | 2007-08-08 20:01:28 +0100 (Wed, 08 Aug 2007) | 1 line
> >
> > added missing requires
>
> This is a one line fix that was also made on the trunk, so you don't
> need to merge this one either.
>
>
> --Rafael
>


-- 
Martin Ritchie

Mime
View raw message