Florent: sorry for the delay.  I had actually started to review this and
then for some odd reason decided to bump to Jason for the fetch
implementation.

So I'll comment on the bit I saw...

Refactor Darcs.Commands.Pull
----------------------------
> -     when (nullFL psFiltered)
> -                      $ do putInfo opts $ text "No remote changes to pull 
> in!"
> -                           definePatches psFiltered
> -                           exitWith ExitSuccess

> +  when  (nullFL psFiltered) $ do putInfo opts $ text "No remote changes to 
> pull in!"
> +                                 definePatches ps
> +                                 exitWith ExitSuccess

Is that intentional?  Looks like you may have lost the skip-conflicts
code there.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9

Attachment: signature.asc
Description: Digital signature

_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to