Fast way to see log changes between two branches?

John Arbash Meinel john at arbash-meinel.com
Thu Jun 5 18:53:16 BST 2008


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

Brian de Alwis wrote:
| Hi everybody.
|
| I've been using bzr with feature branches to do development: I keep a
| branch of the trunk that's maintained against a centralized repository,
| from which I make branches for the different features.
|
| When preparing to merge in completed features, I've found myself wanting
| to see the log entries for the changes since the feature branch was
| branched -- a summary of what's gone on.  But I can't find a nice way to
| do it.  The closest I can find is:
|
|     $ bzr log -r ancestor:../trunk..-1
|
| but this shows the log entry for the common ancestor entry.  I want
| everything *since* that common ancestor.
|
| Is there a way? The only workaround I've found (beyond skipping the
| common log message!) is a shell script like:
|
| $ trunkRevNo=`cd $trunk; bzr revno`
| $ bzr log -r $(($trunkRevNo + 1))..-1
|
| but that assumes that the tip of the trunk is unchanged.  It might work
| if 'bzr revno' could take and resolve a given revisionspec for a
| particular branch.
|
| Brian.
|

$ cd branch
$ bzr missing ../trunk

That will only show the mainline commits that haven't been merged, but it sounds
like what you want.

Alternatively you can use:

$ bzr revision-info -r ancestor:../trunk

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

iEYEARECAAYFAkhIKAwACgkQJdeBCYSNAAPQKQCgk20FoAqyVc9dKvhHs7AASgEB
ra4AoMEo+mPC8btfb9eYdmYnr4MqVhSP
=K+jY
-----END PGP SIGNATURE-----



More information about the bazaar mailing list