Inkscape

  1. Bug #1043571
  2. Comment #9

Comment 9 for bug 1043571

Revision history for this message
David Mathog (mathog) wrote :

How is "bzr merge" used? I copied the two files I modified to a safe place and then did:

bzr revert #because there was no "commit"
bzr merge #to bring the branch in sync with trunk
bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/~inkscape.dev/inkscape/lp988601/.bzr/branch/lock): Transport operation not possible: http does not support mkdir()

Doesn't merge take the changes from trunk and merge them into the local branch? Why would it need a lock file?