Philip Martin wrote:
> Julian Foad <julianfoad@btopenworld.com> writes:
>>If I understand you correctly, there is some aspect of merging that
>>works on trunk, but is broken - and fails a regression test - in
>>1.1.x. If that is the case, then how did the branch get into that
>>state?
>>
>>a) A new bug was ported onto the branch;
>>b) A new regression test was ported onto the branch;
>
> A test that relies on r11479,r11484 which fixes issue 1943 on the
> trunk.
That pair of revisions fixes issue 1943 on the trunk, and also reinstates a
regression test for the bug. Are you saying that another regression test that
also relies on that fix was ported to the branch? If so, surely we should
either remove that other regression test from the branch, or port this fix to
the branch.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 3 19:59:34 2004