Bazaar

  1. Bug #65265
  2. Comment #7

Comment 7 for bug 65265

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 65265] Re: simpler syntax for "diff since last merge"

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

Christopher Armstrong wrote:
> Just to be clear—my impression is that there are cases where the diff
> given while merging a branch into another branch is different from
> anything you can easily do with "diff" without "merge", right?

Not really. As long as you specify the correct revision, you can
generate an identical merge.

The "-r ancestor:" option just provides a way to avoid having to
remember or calculate the correct revision.

Also, there is now the '-r submit:' specifier, which automatically
generates a diff against the common ancestor with the submit branch.

So I would say the title is accurate.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGUyC40F+nu1YWqI0RAmfgAJ9jE3EeH3JnIvSmlTkubfUj/GreNgCdG8Xd
kQaSUZuAedAkroFw8JIJ2sI=
=I8Cm
-----END PGP SIGNATURE-----