Delta not showing modifications sometimes

[Daniel Silverstone]

On Tue, 2005-11-15 at 18:29 -0500, James Blackwell wrote:
> > Daniel Silverstone wrote:
> > > Is this by design, a mistake, a desirable side-effect, or what?
> > It's the documented behavior.  ("Files that are both modified and
> > renamed are listed only in renamed" -- delta.py)  I don't think it's
> > very intuitive, though.

Documented behaviour for the Delta object itself. Not necessarily for
the status output.

> Yeah. Having the UI displaying only one changed state at a time doesn't
> match with behaviour that the users know better about. Newer users could
> wrongly assume that bzr can't walk and chew gum at the same time.

Indeed.

> If the user builds up too many of these sorts of surprises before they hit
> the docs and grok what's going on... well, they probably move on and look
> for another tool that behaves 

This is true. It really confused me for a moment when I was working on
an SQL patch and then renamed it and then status told me it had been
renamed but not changed. I thought for a moment that when I did bzr mv,
it had stomped on my changes.

In my tree at http://bzr.digital-scurf.org/trees/dsilvers/bzr.dev I have
a patch which constructs a side-along list when it displays the renames
and also outputs that during the modified files output. It suffers from
not being sorted into the modified files but does not break the contract
as stated in the TreeDelta docstring.

I could merge the two lists into one for sorting for display but it
seemed like such a corner case that most people won't care that it's out
of order, so long as the information is present in the status output.

What do others think of this as a solution? (I'm still feeling my way
here in the bzr codebase and the community so please do correct me if I
go wandering off down stupid routes or solving things in what you guys
consider to be patently the wrong way :-)

Thanks,

D.

-- 
Daniel Silverstone                         http://www.digital-scurf.org/
PGP mail accepted and encouraged.            Key Id: 2BC8 4016 2068 7895