[MERGE] log multiple files and directories

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> 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)?

It does, but that certainly isn't something you want to do in your
"bzr.dev" mirror. :)

Which is why you can do:

bzr branch bzr.dev incoming_patch
cd incoming_patch
bzr pull --overwrite ../this.patch

And then you have a branch with the full history.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmMX0IACgkQJdeBCYSNAAPDngCgzt+JgqdXrxeW3d4N6oYs747F
cn4An11gJV2iDy971NWJhKIXQEr6lm3v
=zRIW
-----END PGP SIGNATURE-----