[darcs-users] --mark-conflicts

Trent W. Buck trentbuck at gmail.com
Fri Mar 6 23:23:45 UTC 2009

On Fri, Mar 06, 2009 at 03:50:45PM +0000, Eric Kow wrote:
> On Fri, Mar 06, 2009 at 12:03:52 +1100, Trent W. Buck wrote:
> > OK, here's a specific example.  I have a repo for the dotfiles in $HOME,
> > for which the "active development" copy lives on my laptop.  My laptop
> > does not run sshd, so I can push from it and pull to it, but not push to
> > it nor pull from it.
> Thanks!
> > Also, because I am resolving the conflicts in a temp dir on my laptop
> > instead of in situ, it is harder to perform testing and easier to
> > introduce bugs.  For example, the host fs has bash 3.0 instead of bash
> > 3.2, so several times I have broken my login scripts with bash 3.2isms.
> Is there a particular reason why it makes more sense to create a
> temporary directory on the laptop, rather than to just pull to the
> active development directory?

Because the active directory is what actually gets loaded on the
laptop.  So if I pull in office-specific patches that e.g. make
$http_proxy correct for office machines, they will break things on the

> Anyway there seems to be a consensus that implementing the flags
> is OK for those who "know better".  It makes me nervous, but I won't
> fight it...

Well, no one is asking for it to be made the default behaviour.

More information about the darcs-users mailing list