bzr log --short; merging into an empty branch

[John Arbash Meinel]

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

Tom Tobin wrote:
| I've found myself with the following workflow in certain cases:
|
| 1) Making a branch of an upstream project with a particular
| overarching goal in mind
| 2) Making minor "feature" branches from that branch as I work and
| merging them back in
|
| I like how I can use use "bzr log --short" on that local main branch
| to see only the merge messages from my feature branches; I *don't*
| like how the history from the original project also gets included.
| Trying to get around this, I've tried starting out by merging the
| upstream project into an empty branch, only to discover that you can't
| do that.  ^_^  Is there another way to get "bzr log" to leave off the
| original history in a branch, or to merge into an empty branch?
|
|

bzr log -r ancestor:../upstream  --short

that will log revisions only from the common ancestor, so it will actually also
leave off anything which has been merged. You could also use 'bzr missing' to do
the same.

We don't have a specific way to know exactly when you branched from another
branch, because all we have is a DAG of revisions. All we can do is approximate it.

As for merging into an empty branch... You *could* do a single 'bzr commit
- --unchanged' and then 'bzr merge -r 0..-1 ../upstream'. I don't really recommend
it, but you *could*.

John
=:->

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

iEYEARECAAYFAkhQRqgACgkQJdeBCYSNAAP4gACeKyaiFjwT7n6eqAFZ6TnMRuPN
XXMAnApfDeADHvlZwnlveIEkOqLmgnce
=tSrV
-----END PGP SIGNATURE-----