On Sat, 24 Mar 2007, Kouhei Sutou wrote:
> Hi,
>
> In <20070324012750.GL23378@despot.finemaltcoding.com>
> "[swig/ruby bindings] Remaining test failures (post branch merges)" on Fri, 23 Mar 2007 18:27:50 -0700,
> Daniel Rall <dlr@collab.net> wrote:
>
> > Kou, there were some Ruby test failures introduced by the code from
> > the sparse-directories and merge-tracking merges. I've corrected all
> > the problems from the sparse-directories merge, but test_merge and
> > test_merge_peg are failing on trunk as a result of the merge of the
> > merge-tracking branch. I'm attaching a patch which fixes this problem
> > (which is caused merge info inherited from the root of the WC's trunk
> > directory avoiding a repeated merge), but was wondering if this your
> > desired approach, or whether an alternate approach would be more
> > appropriate.
>
> OK. I understand the problem.
> Could you commit this patch?
Committed to trunk in r24070.
- application/pgp-signature attachment: stored
Received on Sat Mar 24 04:02:43 2007