Michael Olson <[EMAIL PROTECTED]> writes:
> Stephen Leake <[EMAIL PROTECTED]> writes:
>
>> Michael Olson <[EMAIL PROTECTED]> writes:
>>
>>> What backend does not place them next to each other?
>>
>> monotone
>>
>> The files are listed in alphabetical order. Since the names are
>> arbitrary, there is no guarantee where they show up.
>
> Is there some option that can be passed to monotone to disable this
> behavior, or at least opt for a better ordering w.r.t. renames?
>
> Alphabetizing should be done in the Emacs Lisp code instead, and it can
> respect rename boundaries. git alphabetizes also, but keeps files with
> a particular kind of change (i.e. modified, added, deleted, unmodified)
> grouped, and keeps renames together.
My description was misleading. Here's an example.
A directory contains two files;
file_a
file_b
Now, using Emacs or shell commands, _not_ monotone commands, the user
modifies file_a, and renames file_b => b_file. Then xmtn-status gives:
unknown b_file
modified file_a
missing file_b
The user then marks 'b_file' and 'file_b', and invokes
dvc-fileinfo-rename (bound to R in dvc-status). The display is
immediately changed to:
==> b_file
modified file_a
rename file_b
Refreshing then gives:
modified file_a
rename file_b
Hmm. This is just wrong; b_file should be shown as a rename as well.
And there should be "to b_file" on file_b. This is what it _should_
output:
==> b_file
from file_b
modified file_a
rename file_b
to b_file
Each rename is shown twice, once as the rename_source, once as the
rename_target. Both entries should show the other name, in the
"more-status" field of the fileinfo.
Here's what it should output with my prefered notation:
rename_target b_file
from file_b
modified file_a
rename_source file_b
to b_file
I think that's clearer. I suppose just "rename" for each would also
work, as long as the "to" and "from" are shown:
rename b_file
from file_b
modified file_a
rename file_b
to b_file
I've looked into what's broken. 'b_file' is missing because monotone
didn't output it. This is due to a recent change in mtn (I'm running
the development head); I'll work on it.
The "to" and "from" are missing because they are only added in
xmtn-diff, not xmtn-status; the code in xmtn-dvc is not shared for
that. I'll work on that too.
I usually commit right after invoking "dvc-fileinfo-rename" above, so
I never see the monotone output of rename_target, so I didn't notice
it was wrong :).
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
