[darcs-users] bug report

Taral taral at taral.net
Thu Oct 28 23:30:58 UTC 2004


On Thu, Oct 28, 2004 at 05:20:31PM -0300, Bryce Wilcox-O'Hearn wrote:
> >Looks like repoA has unresolved conflicts. What does "darcs resolve -v"
> >say?
> 
> $ darcs resolve -v
> diffing dir...
> Finished resolving.

That means you have conflicts. Otherwise it prints "No conflicts to
resolve".

To find out which:

% make ghci
...
Prelude Main> :module +Resolution Repository
Prelude Main Repository Resolution> read_repo "." >>= print.patchset_conflict_resolutions

-- 
Taral <taral at taral.net>
This message is digitally signed. Please PGP encrypt mail to me.
A: Because it fouls the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on usenet and in e-mail?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20041028/fd145fa5/attachment.pgp 


More information about the darcs-users mailing list