[MERGE] add modification dates to diff output, get rid of /dev/null (bug #43033)
James Henstridge
james.henstridge at gmail.com
Wed May 17 12:01:08 BST 2006
I posted this patch a few days ago, but have updated it with a few
more tests, and think it is ready to merge. The branch is available
here (currently at revision 1712):
http://people.ubuntu.com/~jamesh/bzr/bzr.diff-output
The branch addresses bug #43033, making the following changes:
* add a get_file_mtime() method to RevisionTree and WorkingTree
* make _show_diff_trees() include dates in the new/old labels passed
to the diff method.
* for added or removed files, use the same file name with the epoch
date as a label rather than /dev/null.
This gives output more similar to other version control systems, and
stops diffstat from getting confused about added/removed files. By
using the epoch date for removed files in diffs, patch will remove the
emptied file as it does currently.
James.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-diff-output.patch
Type: text/x-patch
Size: 17857 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060517/49800e34/attachment.bin
More information about the bazaar
mailing list