[darcs-users] Spurious conflict

[Erik Schnetter]

On Monday 06 June 2005 19:18, Tommy Pettersson wrote:
> 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.

Thanks.  I knew one of the conflicting patches -- how do I find the 
other one?  Making it depend on just one of the conflicting patches did 
not remove the conflict.

However, I found out that the root of the problem was that this patch 
had been recorded twice, with the same name, but with slightly 
different times.  I recorded a rollback patch for one of them; that 
solved the problem.

Thank you again,
-erik

-- 
Erik Schnetter <schnetter at aei.mpg.de>   http://www.aei.mpg.de/~eschnett/

My email is as private as my paper mail.  I therefore support encrypting
and signing email messages.  Get my PGP key from www.keyserver.net.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20050606/abc24408/attachment.pgp