[darcs-users] case insensitivity and inconsistent state

[Trent W. Buck]

Jason Dagit <dagit at codersbase.com> writes:

> Forgive my top posting, but...
> I think both of you would benefit from doing dry runs more frequently before
> pulling:
> http://darcs.net/manual/node8.html#SECTION00862000000000000000
>
> --dry-run
>
> That could give you heads up about conflicts before they pollute your
> valuable working copies.

We have talked before about making --dont-allow-conflicts the default.
This means that "darcs pull -a" will merge if it can, and complain if it
can't.  IME this workflow is easier than always using --dry-run first.

> Have you ever tried using a diff viewer when you pull?  That may help with
> visualizing the conflicts:
> darcs pull --external-merge COMMAND

That, too, needs work :-)

189,--external-merge tool should properly reference renamed files
343,wish: external-merge does not handle add conflicts well
1201,dir-wide external merge utility
1219,External merge with deletion
1228,optionally disable 'Hit return to move on' in --diff-command and --external-merge
1372,"""--external-merge"" should have ability to store multiple configurations (ala git-mergetool)"