Comment 0 for bug 660935

Revision history for this message
dmuir (dmuir) wrote :

I had the following conflict:
Path conflict: path1/file / path2/file

I tried resolving by:
bzr resolve path2/file --take-this

which gave me
bzr: ERROR: bzrlib.errors.InvalidEntryName: Invalid entry name: path1/file

Crash file is attached.