[merge] Enhancement to also use the external diff tool for new and deleted files.

David Ingamells david.ingamells at mapscape.eu
Mon Sep 15 07:26:38 BST 2008


Extend bzr to also pass added and deleted files to the external diff 
tool when "bzr diff --using" is called.

The diff tool will be given an empty file to compare the deleted or 
added file against
as the new or old file respectively. The consequence is that the deleted 
or added file will be shown in the
diff tool on the appropriate side with nothing shown on the other side.

The empty file will be placed in the root of the
temporary tree created for performing the diff (not in the "new" or 
"old" sub-trees) to avoid
name conflicts and will be called "does_not_exist".

Feel free to be extra critical  ;-)   as this is my first submission to 
bzr *and* my first work with python.

David.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080915/d97d8c9c/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: extdiff.patch
Type: text/x-patch
Size: 6179 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080915/d97d8c9c/attachment.bin 


More information about the bazaar mailing list