Eric Gillespie <epg_at_pretzelnet.org> writes:
>> * Interactive conflict resolution UI: r29189, r29228, r29232, r29251
>> (waiting a day for consensus on new UI)
>
> These went through, which is good, but the diff option is still
> nigh-unusable. I've seen no comment on my patch to send the
> output through the pager.
Could you point to that? (I agree it would be a good option; of
course, for those of us running in an Emacs shell buffer, the pager is
already built into our terminal :-) ).
>> * FSFS recovery: r29175, r29252
>> (waiting on review, could nominate now)
>
> Looks good, but there's a minor usability issue I think we could
> do a better job on.
>
> Index: subversion/tests/cmdline/svnadmin_tests.py
> ...
> +def fsfs_recover_handle_missing_revs_or_revprops_file(sbox):
> ...
> + # Verify 'svnadmin recover' fails when youngest has a revprops
> + # file but no revs file.
> + output, errput = svntest.main.run_svnadmin("recover", sbox.repo_dir)
> +
> + if svntest.verify.verify_outputs(
> + "Output of 'svnadmin recover' is unexpected.", None, errput, None,
> + ".*Expected current rev to be <= 2 but found 3"):
> + raise svntest.Failure
>
> Can't we make the error message say that it was a revs file that
> was missing? I see fs_fs.c:recover_body does some checking;
> maybe we could move that up.
Could you describe what you mean in more words?
I mean, +1 on any change to the error message you want to make, but it
sounds like you're proposing that the code leading up to the error do
something it's not currently doing...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-27 03:13:41 CET