bzr diff behaviour

[Philippe Lhoste]

On 27/03/2009 12:12, Patrice Guérin wrote:
 > I use winmerge as diff tool on windows.
 > When I bzr diff a modified file with its previous revision, I see that
 > that the two files to be compared are stored in a temporary directory.
 > Why bzr diff doesn't compare the true modified file against its revision
 > (this one must stored in a temporary directory, I agree)
 > this should permit to make some more modifications on the diff basis...
 > Does bzr diff is only intended to be used as "read only" ?

Hi Patrice.

I am myself a newcomer to Bazaar (and this ML!) which I use on Windows, and I had some
trouble using WinMerge with it (because I am stubborn enough not to put in in the path!).
See Using winmerge with Bazaar StackOverflow thread
<http://stackoverflow.com/questions/595885/using-winmerge-with-bazaar> for the full story.
I finally use a winmerge.cmd file in the Bazaar directory, with

     "C:/Program Files/UText/WinMerge/WinMergeU.exe" %*

in it, and

     wdiff = diff --using winmerge.cmd

in my ALIASES section of bazaar.conf

A bit clumsy but it works.

All this to say that if I do:

     bzr wdiff -r 1 Base.fx

it works well, and I have:

     C:\Documents and Settings\plhoste\Local Settings\Temp\bzr_diff-cw8jrp-rev1_tmp\Base.fx
     E:\Dev\PhiLhoSoft\JavaFX\Base.fx

as arguments to WinMerge. It does that with the current version, committed or not.

French Windows XP Pro SP3

 > bzr info
Standalone tree (format: pack-0.92)
Location:
   branch root: .

Related branches:
     push branch: D:/PhiLhoSoft/JavaFX
   parent branch: D:/PhiLhoSoft/JavaFX

 > bzr --version
Bazaar (bzr) 1.11
   Python interpreter: C:\Program Files\UDev\Bazaar\python25.dll 2.5.2

So in conclusion, I don't have the behavior you describe. Have you an older (or newer)
version of Bazaar?

[PS.: I have already sent this message, via gmane, it looks like the authentication 
process have put the initial message in a black hole...
Apologies if it shows twice.]

-- 
Philippe Lhoste
--  (near) Paris -- France
--  http://Phi.Lho.free.fr
--  --  --  --  --  --  --  --  --  --  --  --  --  --