Excess data size for a single revision
John Arbash Meinel
john at arbash-meinel.com
Tue Jan 24 12:41:34 UTC 2012
-----BEGIN PGP SIGNED MESSAGE-----
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,
> Could you please describe what does "do not merge to trunk" do?
Given the specific history, I'm pretty sure this was done with
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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----END PGP SIGNATURE-----
More information about the bazaar