[cvsnt] More merging problems

[Tony Hoyle]

On Mon, 16 Feb 2004 15:07:20 -0000, "Harrison, Andrew"
<andy.harrison at anite.com> wrote:


>
>When I merged Branch2->Branch1 it undid the changes from HEAD (1.1-1.2).
>Surely this is wrong?
>
Hmm...  That's a fairly odd combination of updates but it is a bug.
It really shouldn't do any merge at all (since the branch isn't live
yet).

It'll be fixed in the next release.

Tony