On Thu, Sep 3, 2009 at 5:43 AM, Eduardo Cavazos<[email protected]> wrote: > On Sep 2, 2009, at 10:30 PM, Eduardo Cavazos wrote: > >>> Oh and... is there an easy way to automatically resolve these via some >>> bzr command as opposed to manually fixing the conflicts? > > Abdulaziz Ghuloum wrote: > >> bzr revert should do it > > Hmmm... I'm getting a weird error with that: > > /src/ikarus.dev # bzr revert > bzr: ERROR: Cannot lock > LockDir(http://ikarus-scheme.org/ikarus.dev/.bzr/branch/lock): Transport > operation not possible: http does not support mkdir() > /src/ikarus.dev #
This is a known bug in bzr that nobody seems to want to fix https://bugs.launchpad.net/bzr/+bug/319374 > > Ed >
