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@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.

Attachments

• darcs-bindann-bug.tar.bz2

On Sep 10, 2007, at 13:52 , nathan wilcox wrote:
> When I pull, there are no changes to pull in, but when I push to  
> the same remote repository it complains about conflicts.

You have unrecorded changes in the working directory of the remote  
repository. Either record them or do a "darcs revert" to throw them  
away and then push will work fine.

--Terry