random thought for bzr-email

Robert Collins robertc at robertcollins.net
Thu Jul 26 04:31:12 BST 2007


On Wed, 2007-07-25 at 01:21 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > I get massive emails when I merge bzr.dev. But I'm not really interested
> > in the content from bzr.dev; I'm interested in work done in the branch.
> > 
> > I wonder if a mpdiff that shows only genuinely new work would make
> > sense. Then 'merge bzr.dev' would show how I changed NEWS to deal with
> > conflicts; or possibly even 'no new work'.
> 
> Here's what an mpdiff looks like.
> 
> I don't think it's a very human-readable format, but if you really want
> something like this, I can help.

Well, if we can munge it into a unidiff format - even knowing it won't
apply as a diff :) - it might be nice. 
e.g.

=== modified file 'inventory'
--- NEWS	2007-07-25 00:52:21 +0000
+++ NEWS	2007-07-25 21:29:22 +0000
@@ -00,0 +00,1 @@
<inventory format="5" revision_id="aaron.bentley at utoronto.ca-20070721003542-7k1mox1rd33kc6iq">
@@ -100,1 +101,1 @@
<file file_id="inventory.py-20050309040759-6648b84ca2005b37" name="inventory.py" parent_id="bzrlib-20050309040749-4ac9a0e211602846" revision="aaron.bentley at utoronto.ca-20070721003542-7k1mox1rd33kc6iq" text_sha1="d8426bff7fe9f229df7cd35d6d582a836e6e7df8" text_size="53271" />
@@ -504,1 +505,1 @@
<file file_id="tree.py-20050309040759-9d5f2496be663e77" name="tree.py" parent_id="bzrlib-20050309040749-4ac9a0e211602846" revision="aaron.bentley at utoronto.ca-20070721003542-7k1mox1rd33kc6iq" text_sha1="77fb27ac14ce8cbf408ae0eb09abf668713b7c63" text_size="33627" />
...


Thinking further on the problem, all commits to bzr.dev are interesting
to show in total; so this will need to be an optional knob I think; on
'trunks' turn it off, on 'branches' turn it on.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070726/25d6e60f/attachment.pgp 


More information about the bazaar mailing list