Excess data size for a single revision
monnier at IRO.UMontreal.CA
Tue Jan 24 14:51:34 UTC 2012
>>>>> 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?
It tells bzrmerge.el that this revision is one that should probably not
be merged, so bzrmerge.el prompts the user to confirm whether or not to
merge the corresponding revision.
> 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"
Yes, that's pretty much what happens if the user decides not to merge
More information about the bazaar