[MERGE] log multiple files and directories

[Ian Clatworthy]

John Arbash Meinel wrote:

> It is also possible that Ian did: "bzr send ../not-bzr.dev", and picked
> a different branch to base his changes on.

I did. I also made sure the other branch was pushed somewhere public
because I'm pretty sure BB would hate my patch otherwise.

Yet again, the merge
> directive knows exactly what base it is applying to. The idea is that if
> you "cd bzr.dev-copy; bzr merge ../this-patch" it should only apply the
> changes listed, and not the rest of "not-bzr.dev".

I wonder if "bzr pull ../this.patch" would have found and pulled in
all the changes from both branches (like I assumed merge would do)?

>> However, if I move into the bzrlib directory and try it again I get this:
> 
>> ../bzr log remote.py repository.py
>> bzr: ERROR: Path unknown at end or start of revision range: repository.py
> 
>> The two should be equivalent, right?

Yes.

> I assume we are just missing a 'relpath' call over the list of files.

Something like that. I'll take a look when I'm awake. :-)

Ian C.