Re: Subversion 1.5 -- next steps

Karl Fogel <kfogel_at_red-bean.com> 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.

> * 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.

-- 
Eric Gillespie <*> epg_at_pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org