On Wed, Nov 10, 2010 at 12:20:29 +0000, Florent Becker wrote:
> This bundle contains what is now needed to be pulled from screened to head to 
> apply without
> conflicts.

Ah, thanks for looking into that :-)

Note the possibility of just doing an unstable+branch-2.5 conflict
resolution (if the blocking is really unacceptable).

The cost is an extra conflict, but I guess darcs could always use
a conflict resolution workout from within the team.

> Wed Oct 20 01:59:50 CEST 2010  Eric Kow <ko...@darcs.net>
>   * Resolve conflicts between test harness extensions and cleanups.
> I cannot find this in the patch tracker!!

I think that's patch425 (plugging that patch name into the roundup
patch search UI)

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:ko...@jabber.fr (Jabber or Google Talk only)

Attachment: signature.asc
Description: Digital signature

_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to