Previewing changes
Aaron Bentley
aaron at aaronbentley.com
Thu Jul 31 01:51:18 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Robert Collins wrote:
> On Thu, 2008-07-31 at 09:35 +1000, Ben Finney wrote:
>> Is this the point at which 'bzr merge --preview' is doing something
>> that is impossible to pass to the existing 'bzr diff' functionality?
>
> A revspec might work -
> diff -r preview:BRANCHSPEC
Right, but then
1. How do you specify the merge type?
2. How do you enable --reprocess
3. How do you enable --show-base?
4. How do you specify a range of revisions to merge into the branch?
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIkQyG0F+nu1YWqI0RAoanAKCDIWSs3QPX6dX2CzArJnMg76vmxgCcDxyH
q8RDBHLC6Cm7DG4BO5IqMAY=
=ypOu
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list