What is a modification?

Eli Zaretskii eliz at gnu.org
Sat Oct 8 06:01:14 UTC 2011


> Date: Sat, 8 Oct 2011 11:07:40 +1300
> From: Robert Collins <robertc at robertcollins.net>
> Cc: bazaar <bazaar at lists.canonical.com>
> 
> I may have the name wrong; its a plugin Aaron wrote - and nothing to
> do with automatic merges; it aims to show a sensible 'what changed in
> this branch' when a merge from trunk is done. That is, if the merge is
> identical (modulo line offsets) to what happened on trunk since the
> last synchronisation point, the incremental diff in the branch will be
> empty. If some reconciliation happens (e.g. updating to a new API,
> conflict resolution,whatever) then the diff along the branch for that
> change will be shown - but not changes from trunk.

I think you mean difftacular.



More information about the bazaar mailing list