Excess data size for a single revision

[John Arbash Meinel]

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

On 1/24/2012 5:05 AM, Eli Zaretskii wrote:
>> From: Stefan Monnier <monnier at iro.umontreal.ca> Cc: Glenn Morris
>> <rgm at gnu.org>,  john at arbash-meinel.com,  mbp at sourcefrog.net,
>> bazaar at lists.canonical.com Date: Mon, 23 Jan 2012 20:35:50 -0500
>> 
>>>>> Since the log messages say "do not merge to trunk" (because
>>>>> the trunk already had such Copyright changes), I assumed
>>>>> Glenn didn't.  Glenn?
>>>> I used bzrmerge.el. You'd have to ask Stefan what it does,
>>>> exactly.
>>> Stefan?
>> 
>> Yes?
> 
> Could you please describe what does "do not merge to trunk" do?

Given the specific history, I'm pretty sure this was done with
something like:

cd trunk
bzr merge ../other-branch
bzr revert .
bzr commit -m "Merge but ignore the copyright changes"

I realize the specifics may be different, but that could easily be why
you would have lots of changes in the ancestry, but not actually shown
in the trunk revisions.

John
=:->

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

iEYEARECAAYFAk8epv4ACgkQJdeBCYSNAAPxBwCgqdm1JqnEg7E40/56iip9eJbL
fPAAoIBEAVVcTdcYTiCrk5zsF8Zo8TvF
=mixe
-----END PGP SIGNATURE-----