[MERGE] log multiple files and directories

Ian Clatworthy ian.clatworthy at internode.on.net
Fri Feb 6 02:45:06 GMT 2009

Colin D Bennett wrote:
> On Thu, 05 Feb 2009 23:05:11 +1000
> Ian Clatworthy <ian.clatworthy at internode.on.net> wrote:
>> The attached patch implements two of the features
>> blocking adoption by the Emacs development community,
>> namely:
>> * the ability to log multiple files
>> * logging a directory should log changes to it and its
>>   children, not just treat the directory as a plain object.
>> I'd *really* like this to make 1.12 but I appreciate that it
>> may not be reviewed and ready in time. Obviously, the odds
>> of making the right choice here will depend on how much user
>> testing we can do in addition to any review. If you want this
>> feature in 1.12, please test this patch ASAP. (Hi Karl!)
> OK!  I want to see it in 1.12, so I'll be testing it.
> I have a problem right away though:  I can log single files, but when I
> try to log a directory, it crashes:
> cdb at gamma ~/bin/bzr.current $ bzr log tools
> bzr: ERROR: exceptions.TypeError: get_deltas_for_revisions() takes
> exactly 2 arguments (3 given)

How did you apply the patch? I *think* "bzr merge bundle-name"
ought to do it, while "bzr patch bundle-name" won't. IIUIC,
merging a bundle should be smart enough to realise that the
revisions from the dependent partial-delta branch are needed too.

If "bzr merge bundle" doesn't work, you can grab the full branch
from https://code.launchpad.net/~ian-clatworthy/bzr/log-dir.

Ian C.

More information about the bazaar mailing list