Re: svn status prints '+'

Blair Zajac <blair@orcaware.com> writes:

> There appears to be a bug where if you do a svn cp or svn mv on a
> file and then modify it, it still gets a 'A +' instead of a 'M +'.
> I've opened issue #818 about it.

Well, I guess it's debateable whether it's a bug. It's more like a
bunch of rules coming into conflict.

Rule 1: a scheduled (A)dd or (D)eletion is 2 columns wide, and always
overrides any display of local mods.

Rule 2: a copy is still an (A)dd. (just has some history attached)

Rule 3: things within a copied directory aren't directly scheduled
for additon, but they *indirectly* are, by virtue of being children.
So they don't show up with an "A" next to them, because they're not
scheduled objects. Instead, the "+" is used to show that they're
indirectly scheduled for addition.

So here's what's going on:

-- When you copy a file and then make mods to it, rules #1 and #2 are in
   effect.

-- When you copy a directory and modify a child, rule #3 is in effect.

We've been over this ground a long time ago. One solution was to say,
"hey, *every* single child of the copied tree should have an 'A' next
to it. that would create consistency." Effectively deleting rule #3.

But then what if you schedule a totally new file for addition within
the copied tree? You wouldn't be able to see it. Unless maybe you
put another 'A' in the 4th column.

Anyway, it's a can of worms. I'm not sure what the best solution is.
Even rules #1 and #2 create an effect that's not really
desirable... but how do we display that something is simultaneously
scheduled for addition-with-history *and* has local mods?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 25 22:36:23 2002