Problem diffing 2 branches

[Jean-François Veillette]

>> Le 07-03-26 à 14:13, John Arbash Meinel a écrit :
>>
>>> Jean-François Veillette wrote:
>>>> 13:53:32: bzr diff .  ~/Developement/WebObjects/Wonder/Ajax/Ajax/
>>>> ... ... ...
>>>> === modified file 'Components/AjaxAutoComplete.api'
>>>> bzr: ERROR: [Errno 2] No such file or directory:
>>>> '/Users/jfv/Developement/BiblioChamplain/Tamia2/ 
>>>> DependancesExternes/Ajax/Components/AjaxAutoComplete.api'
>>>>
>
> ^-- Hmm. Did if you do 'bzr status' in '.' does it give you "===  
> renamed
> file .... => ...." ?

in my current branch (.)
bzr log (we are now at revision 10)
...
revno: 2
committer: Jean-François Veillette <jean.francois.veillette at gmail.com>
branch nick: Ajax
timestamp: Sun 2006-11-05 11:49:46 -0500
message:
   - Création d'un projet XCode qui construit un framework fonctionnel.
added:
   .bzrignore
renamed:
   Components => Sources/er/ajax/Resources
modified:
   Ajax.xcodeproj/project.pbxproj
   Resources/Properties
------------------------------------------------------------
...

> We could certainly have a limitation in the diff across branches code.
> But if 'bzr diff -r -3' works in the directory you renamed the file, I
> would expect the diff between branches to work.


  bzr diff -r -3 is working all right (on both branch).  actually  
since the rename was at revision 2 and it is now at revision 10, I  
did 'bzr diff -r -10' and it is working ok.

- jfv

PS: thanks for the cherry pick tips !__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com