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

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

Hi Andrew,

This is great now, thanks.

merge-part NAME BRANCH REVISION SUBDIR [TARGET-DIR]

I think I might prefer

merge-part NAME BRANCH SUBDIR REVISION [TARGET-DIR]

(Maybe even:

merge-part NAME BRANCH SUBDIR [REVISION [TARGET-DIR]]

or

merge-part NAME BRANCH SUBDIR [TARGET-DIR [REVISION]])

We can't do

from bzrlib.cleanup import OperationWithCleanups

unfortunately, as it is too new for the bzr that we need to work with.
We could backport newer bzr's for building older distroseries, but that's
quite a bit of work.

MergeIntoMerger only seems to be in newer bzr's too? Is there any way that
we can avoid depending on that?

108 + if target_subdir is None:
109 + target_subdir = os.path.basename(subpath)

I wouldn't expect that, I would think that it would just be "subpath".

I'm happy to do the work to merge this in, the only blocker right now
is MergeIntoMerger, so if you could comment on that then we can move
forward.

Thanks,

James

review: Needs Fixing

« Back to merge proposal