[darcs-users] darcs

Hugo Pacheco hpacheco at gmail.com
Wed Jun 20 01:48:15 UTC 2007


I've managed to solve it!
first did a darcs repair in order to remove some incoherent files from
_darcs/current.

Then I needed to delete some references in the _darcs/patches/pending that
were responsible for the conflict.
It took me a while...

However, I've learned that if darcs send --output=bundle, I can darcs apply
bundle --mark-conflicts in the server and solve it in *force mode*.

Anyway, thanks for the help,
hugo

On 6/20/07, VMiklos <vmiklos at frugalware.org> wrote:
>
> Na Tue, Jun 19, 2007 at 06:04:05PM +0100, Hugo Pacheco <hpacheco at gmail.com>
> pisal(a):
> > After darcs get a fresh copy of a remote repository
> > 1) I add some new files
> > 2) darcs record a new patch
> > 3) darcs push the new patch
>
> what's the url of the repo - if public?
>
> what files did you add? (i mean the filenames)
>
> thanks,
> VMiklos
>
> --
> developer of Frugalware Linux - http://frugalware.org
>
> _______________________________________________
> darcs-users mailing list
> darcs-users at darcs.net
> http://lists.osuosl.org/mailman/listinfo/darcs-users
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osuosl.org/pipermail/darcs-users/attachments/20070620/08ff1db6/attachment.htm 


More information about the darcs-users mailing list