[darcs-devel] [issue533] push/pull conflict conflict.

nathan wilcox bugs at darcs.net
Mon Sep 10 17:52:54 UTC 2007


New submission from nathan wilcox <nejucomo at gmail.com>:

Hello fellow toolsmiths,

I've attached a tarball with both the local and remote repositories of
a GPL'd python tool I am writing, as well as the following
description:

When I pull, there are no changes to pull in, but when I push to the same remote
repository it complains about conflicts.

Here is the output:

$ darcs pull
Pulling from "remote-host.com:public_repositories/bindann"...
No remote changes to pull in!

$ darcs push
Pushing to "remote-host.com:public_repositories/bindann"...

Fri Aug 10 16:49:57 MDT 2007  nejucomo at gmail.com

... Patch description removed.

Shall I push this patch? (1/1)  [ynWvpxqadjk], or ? for help: y

darcs failed:  Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts option There are conflicts in the following files:
[... paths omitted ...]
to apply.

----------
files: darcs-bindann-bug.tar.bz2
messages: 2126
nosy: beschmi, droundy, kowey, nejucomo, tommy
status: unread
title: push/pull conflict conflict.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue533>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: darcs-bindann-bug.tar.bz2
Type: application/x-bzip2
Size: 113997 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070910/d97b6840/attachment-0001.bin 


More information about the darcs-devel mailing list