Code review comment for lp:~spiv/bzr-builder/merge-subdirs-479705

Revision history for this message
James Westby (james-w) wrote :

Hi,

I think I would like to see catching UnrelatedBranches, and then if a subdir
is specified, try again with NULL_REVISION as the base. If there are then
any conflicts it should bail out as normal.

This should have it work for the simple case, which is a start.

Why specify the subdirectory separate from the URL? Could we not do an
open_containing and use the subpath returned from that?

Thanks,

James

« Back to merge proposal