On Thu, Oct 28, 2004 at 03:42:13PM -0300, zooko@xxxxxxxxx wrote:
> I have a repo A. I do this:
>
> mkdir newrepoB
> cd newrepoB
> darcs init
> darcs pull --all -v ~/repoA
>
> and I get conflicts:
>
> """
> diffing dir...
> We have conflicts in the following files:
> ./Shtoom/shtoom/shtoom/rtp/protocol.py
> Applying patches to the local directories...
> Finished pulling.
> """
Looks like repoA has unresolved conflicts. What does "darcs resolve -v"
say?
--
Taral <taral@xxxxxxxxx>
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?
pgp3bcwFwA6WN.pgp
Description: PGP signature
_______________________________________________
darcs-users mailing list
darcs-users@xxxxxxxxxxxxxxx
http://www.abridgegame.org/mailman/listinfo/darcs-users
| 
