[MERGE] Gracefully handle wrong parent kind (Bug #177390)

Aaron Bentley aaron.bentley at utoronto.ca
Tue Dec 25 21:43:51 GMT 2007


Hi all,

This patch adds support for gracefully handling one of the few unhandled
conflict types.  When one side of a merge considers a file-id to be
a directory, and modifies its contents, while the other side considers
it to be some other type, Bazaar could detect the problem but not handle
it gracefully.

With this patch, a new directory is created with the basename plus the
extension ".new", and any contents that should be in the directory are
moved there.  A NonDirectoryParent conflict is added to the working
tree's conflict list.

Happy holidays to those of you celebrating!

Aaron
-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolve-parent-kind.patch
Type: text/x-diff
Size: 14224 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071225/b0e485a7/attachment.bin 


More information about the bazaar mailing list