Bazaar

  1. Bug #113809
  2. Comment #2

Comment 2 for bug 113809

Revision history for this message
John A Meinel (jameinel) wrote : Re: complains about conflicts in figments of its own imagination

I don't think so. I'm pretty sure he did that early on. The problem as I see it is:

At some point there was a conflict in debian/changelog so we created debian/changelog.{THIS,BASE,OTHER}

Someone did a plain 'bzr add' (perhaps because there were other unknowns) and then 'bzr commit'.

At this point, there are versioned files named debian/changelog.THIS {BASE, OTHER}.

Then we get a new conlfict in debian/changelog.

We try to write debian/changelog.THIS, but there is already a versioned file with that name, so we move that file out of the way (debian/changelog.THIS.moved) and create a new debian/changelog.THIS. Whever we move a file because we are trying to create a file in that location, we mark it as conflicted.

So the actual conflict is no debian/changelog. Instead it is debian/changelog.THIS

The fix I would recommend is:

bzr resolve debian/changelog.*
bzr rm debian/changelog.*
(possible rm debian/changelog.*)

bzr commit