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
-----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 enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFGUyC40F+ nu1YWqI0RAmfgAJ 9jE3EeH3JnIvSml TkubfUj/ GreNgCdG8Xd w8JIJ2sI=
kQaSUZuAedAkroF
=I8Cm
-----END PGP SIGNATURE-----