[Talk-GB] Help: Conflict not resolving in Potlatch 2

[Graham Stewart]

Thanks Andy.
Lots of undoing did get me back to a point that I could save, so at
least not everything was lost - just an hour or so... *sob*

At least you got the bug fixed so some good came of it anyway.

Right, now where was I....

Graham



On Fri, 27 May 2011 14:07 +0100, "Andy Allan" <gravitystorm at gmail.com>
wrote:
> On Fri, May 27, 2011 at 11:43 AM, Graham Stewart <graham at dalmuti.net>
> wrote:
> >
> > Please excuse the slight off-topic, but I've spent the morning doing
> > some Bing/OS_OpenData armchair mapping around Amble in Alnwick and
> > Potlatch is refusing to save my changes.
> >
> > I get a message saying:
> >
> >  "An item you edited has been changed by another mapper.
> >   Download their version and try again?
> >   (The server said: Version mismatch: Provided 1420, server had: 1421
> >   of Relation 9579)"
> >
> > If I say "Yes" then I just get the same message again (and again and
> > again...) until it eventually it gives up and says "HTTP error".
> >
> > Does anyone have a way out of this scenario or my work lost?
> > I'd be happy to lose just my changes to members of that relation but
> > keep everything else.
> >
> > I've tried pressing 'C' to close the changeset and starting a new one.
> > (I've also noticed that if you confirm that dialog with the return key,
> > rather than space, then it seems to report a new changeset ID anyway).
> 
> From what I can see in the potlatch2 code, there appears to be a bug
> in the code that downloads relations for conflict handling.
> 
> The only thing I can suggest is to press undo until you get back
> before the edit which changed the relation (national cycle route 1, in
> this case). If it was towards the end of your session you might be
> able to save some work. If anyone knows of any other "tricks" to get
> around this I'd love to hear them!
> 
> Meanwhile I've written a fix for the potlatch2 code[1]. Thanks for
> your detailed explanation of what you were doing, it's made it very
> easy to follow through the code and figure out what's going on.
> 
> Cheers,
> Andy
> 
> [1]
> https://github.com/gravitystorm/Potlatch2/commit/47a7aeb5c6d30b295cb92a09233118a2fe60fee5
>