[darcs-users] Spurious conflict

[Tommy Pettersson]

On Mon, Jun 06, 2005 at 06:57:55PM +0200, Erik Schnetter wrote:
> I have pulled a patch from another repository which resulted in 192 
> spurious conflicts (i.e., changes where I did not see any).  Reverting 
> the tree removed all conflicts.  When I now try to push to the master 
> repository of my repository, I receive

Revert did not remove the conflict, only the conflict markups
(if any).

> darcs push [...]
> darcs failed:  Refusing to apply patches leading to conflicts.
> 
> When I want to record my "conflict resolution" (i.e., doing nothing), I 
> receive
> 
> darcs record
> No changes!
> 
> What can I do to resolve these conflicts that are not?

The conflict is resolved by any patch that depends on the
conflicting patches.  The patch doesn't really need to touch
any of the conflicting lines; it can even be a tag.

So you can, for example, record an empty patch with --ask-deps
and make it depend on the conflicting patches.


-- 
Tommy Pettersson <ptp at lysator.liu.se>