[PATCH] [Bug 209281] Re: Windows diff apps don't understand symlinks created by Cygwin bzr diff --using

Ian Clatworthy ian.clatworthy at canonical.com
Thu May 22 07:47:21 BST 2008


Matt McClure wrote:

> Is the attached patch better with respect to test_prepare_files?

IMO, this is almost ready to merge. It still needs a test and
two tweaks:

1. osutils.host_os_dereferences_symlinks() is a public function so
   it needs a test added to tests/test_osutils.py. I'm ok if the
   test simply checks that the function is present, i.e. it can be
   called without throwing an exception.

2. In test_diff.py, result=proc.stdout.read() needs spaces either
   side of the = character.

3. It's fixing a bug so please add an entry into NEWS.

As a final comment, sending diffs to the list is OK but sending
merge directives is better. Here's one way to do that:

  bzr send -o ../59302.x.patch
  (switch to your mail tool and attach the file)

bzr send can also be configured to launch your mail tool but
that isn't necessary - you can still send merge directives using
the technique above.

Ian C.



More information about the bazaar mailing list