'bzr diff -rnn..nn some_file 'will return nothing if some_file was in a different directory back in nn..nn

Bug #38458 reported by James Troup
2
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
High
Aaron Bentley

Bug Description

$ bzr diff -r3029..3055 sync-source.py
$ bzr diff -r3029..3055 ../sync-source.py
=== modified file 'a/scripts/sync-source.py'
[ ... ]

This is similar to #3619, but the bug here/difference IMO, is that 'bzr diff' when given specific revisions, should be able to figure out the file location at that time without user help.

Martin Pool (mbp)
Changed in bzr:
status: Unconfirmed → Confirmed
Aaron Bentley (abentley)
Changed in bzr:
assignee: nobody → aaron-bentley
status: Confirmed → In Progress
Revision history for this message
Aaron Bentley (abentley) wrote :

I can't reproduce this: in bzr.dev:

bzr diff -r -500 bzrlib/tests/test_diff.py and bzr diff -r -500 bzrlib/selftest/testdiff.py produce the same results.

Changed in bzr:
assignee: aaron-bentley → nobody
Revision history for this message
Aaron Bentley (abentley) wrote :

Oh, I get it. The bug is that bzr diff -r -500..501 bzrlib/tests/test_diff.py doesn't work.

In other words, diff should consider the file ids of the working tree, as well as those in the historical trees, when mapping filenames to file ids.

Changed in bzr:
assignee: nobody → aaron-bentley
Aaron Bentley (abentley)
Changed in bzr:
status: In Progress → Fix Committed
Revision history for this message
John A Meinel (jameinel) wrote :

I believe this fix was merged in:
1843 Canonical.com Patch Queue Manager 2006-07-06
      diff always permits filenames from working directory

So I'm marking it as released. Re-open if this is incorrect.

Changed in bzr:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.