[MERGE] Tweak diff --using

Aaron Bentley aaron.bentley at utoronto.ca
Thu Dec 27 15:44:14 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

Here are some tweaks for diff --using:
1. When writing files, it sets the mtime, so that programs that read the
mtime (e.g. /usr/bin/diff) use the correct value.
2. Temporary files are set as readonly, to discourage editing them in
programs like vimdiff, and osutils.rmtree is used so that the readonly
files are deleted on win32.
3. When using trees that have a filesystem location (i.e. working
trees), and if symlinks are supported, creates a symlink to that tree
instead of creating new copies of its files.  This makes it possible to
use gvimdiff and edit the new file.
4. The path parameter is provided to Tree.get_file.

Aaron

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHc8hO0F+nu1YWqI0RAtGiAJ9ED6PYrM5ODAf5vk720V2VOpvlEgCdHijY
mY0mjxZnM4HdVcR4o/X6tGI=
=SuD7
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: diff-using-2.patch
Type: text/x-patch
Size: 8314 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071227/bff34469/attachment-0001.bin 


More information about the bazaar mailing list