[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35326 - branches/issue-3334-dirs/subversion/tests/cmdline

From: Stephen Butler <sbutler_at_elego.de>
Date: Tue, 20 Jan 2009 16:44:55 +0100

Hi Julian and other tree conflict fans,

Are you sure we want to allow some TC victims to be deleted
by update/switch, and some not?

The current behavior in the issue-3334-dirs branch, in the
case of "incoming delete upon update", skips the TC victim
if it's a directory tree, but deletes the TC victim
if it's a file or empty dir.

For quite a while we've had the skipping behavior for all
TC victims. Four tests that fail on the branch,

   update_tests.py 47 51
   switch_tests.py 32 35

fail because they expect all TC victims to be skipped.

Our main reason for skipping is to make it easier for the
user to rescue any local modifications. With your re-add
feature, this reason no longer exists.

A second reason for skipping is to preserve info about which
revision of the victim was deleted locally, in the case
of "local delete". But the extension of the tree conflict
data to include version info makes this reason obsolete, too.

Can anyone think of any other reason for skipping tree
conflicts? (Or any other flaw in my reasoning?)

If we can't, then I think we should change the TC design
and get rid of the skipping entirely. It's a new feature
that could confuse users, and it goes against the grain of
the rest of the 'svn update' code. If we can live without
it, we're better off.

Regards,
Steve

Quoting Julian Foad <julianfoad_at_btopenworld.com>:

> Author: julianfoad
> Date: Mon Jan 19 09:12:08 2009
> New Revision: 35326
>
> Log:
> Fix two test expectations, thus reducing the number of test failures to 9.
>
> * subversion/tests/cmdline/commit_tests.py
> (tree_conflicts_resolved): Remove an old comment.
>
> * subversion/tests/cmdline/revert_tests.py
> (revert_tree_conflicts_in_updated_files): Expect the deleted file to be
> gone from disk.
>
> * subversion/tests/cmdline/stat_tests.py
> (status_with_tree_conflicts): Expect the deleted file to have a status
> code of '!' and no last-commit or current-revision status.
>

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Received on 2009-01-20 16:45:13 CET

This is an archived mail posted to the Subversion Dev mailing list.