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

[Matt McClure]

Aaron,

Is the attached patch better with respect to test_prepare_files?

I understand that you've been concerned that my use of newname2 was
superfluous.  However, it serves two purposes.  First, it addresses a
preexisting failure on Windows.  Second, it allows test_prepare_files to
continue succeeding on Cygwin after my changes to the code under test in
this thread.  Previously, the final call to _prepare_files succeeded on
Cygwin and other platforms with symlinks for the wrong reasons.

I hope this version of the patch makes it clearer why newname2 is
necessary.  Before the change, oldname2 and newname2 refer to nonexistent
files in the final call to _prepare_files in test_prepare_files.  I think
_prepare_files requires that its old_path and new_path arguments refer to a
single existing file, in the old and new trees respectively, at its file_id
argument.  This version of my change makes oldname2 and newname2 exist at
file2-id.

Matt


On Tue, Apr 29, 2008 at 10:47 AM, Matt McClure <mlm at aya.yale.edu> wrote:
> On Sun, Apr 27, 2008 at 4:10 PM, Aaron Bentley <aaron at aaronbentley.com> wrote:
>>  You haven't removed the tree/newname2.
>
> Without newname2, test_prepare_files fails on Windows (and on Cygwin
> with my patch to the code under test).  Maybe what I've done isn't the
> right fix, but the test is broken before my patch.  See
> https://bugs.launchpad.net/bzr/+bug/212289 .  Could you suggest a
> better fix?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug.209281.7.patch
Type: application/octet-stream
Size: 4568 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080504/c9857a50/attachment.obj