On Fri, Oct 29, 2004 at 12:04:40PM -0500, Taral wrote:
> On Fri, Oct 29, 2004 at 12:14:24PM -0300, Zooko O'Whielacronx wrote:
> > Okay, I cleaned it up by running "darcs resolve", examining the results
> > of "darcs whatsnew", remembering the name of the patches involved, and
> > unpulling them.
> >
> > However, I'm confused by the fact that "darcs whatsnew" before the
> > "darcs resolve" said "No changes!". I think that it should be
> > impossible for "darcs whatsnew" to say "No changes!" when there is an
> > unresolved conflict in that repo.
>
> I think "darcs resolve" should print out the names of the conflicting
> patches. I could probably hack up a patch to do that too...
That would be nice...
--
David Roundy
http://www.abridgegame.org
signature.asc
Description: Digital signature
_______________________________________________
darcs-users mailing list
darcs-users@xxxxxxxxxxxxxxx
http://www.abridgegame.org/mailman/listinfo/darcs-users
|
