Petr Rockai <[email protected]> writes:

> Christian Kellermann <[email protected]> writes:
>> 1) darcs whatsnew --summary -l to see which files changed.
> To save typing, "darcs wh -sl" works just as fine.

This is congruent to "darcs w -l".

>> 5) darcs pull -a, note that this will change your working copy.

That's OK, because "hg pull -u" does that, too (the -u switch).

>> To check for conflicts before doing so, add the --dry-run flag.
> You can streamline with darcs pull -a --dont-allow-conflicts, which will also
> apply in the safe case (no conflicts).

Ooh.  And all this time I've been doing this fugly thing to avoid
a "darcs pull" introducing conflicts:

## "Kindly" push -- push all patches that don't introduce conflicts.
x=yd; while while darcs push "$@" <<<$x; do sleep 1; done; do x=n$x; done

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

Reply via email to