[PATCH 0 of 1] rebase: fix for issue15161

[Martin Geisler]

Christian Boos <cboos at neuf.fr> writes:

Hi Christian,

I've not looked at patch itself, but you had a more general question at
the end:

> Interestingly, the change triggers a failure in another rebase test.
> Looking closer, it seems that the new output is likely the correct one
> (i.e. no conflict, first rebase completes).
>
> So what should I do here? Simply fix test-rebase-collapse.out?

Yes, we try to ensure that the test suite works on every changeset. So
if a change causes test output to change we update the output in the
same patch. You should then include a nice description of why the output
changes and why the new output is the correct output.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091109/430170ce/attachment.pgp>