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

Re: svn commit: r1480669 - interactive 'dc' and 'edit' for prop conflicts

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 13 May 2013 22:10:58 +0100 (BST)

> Author: stsp

> URL: http://svn.apache.org/r1480669
> Log:
> If a merged property value exists, make the 'dc' conflict prompt option
> use the merged value as 'mine' for display. Else, users might get confused
> if they edit a property, run 'dc', and see the value from before the edit.

Hi Stefan.  I see how it could be confusing, but now it is inconsistent with text conflict handling:

             | text conflict  | prop conflict
-------------+----------------+------------------------
  'dc' shows | original text  | edited val
  'e'        | edited text    | conflict hunk with original val

and also inconsistent with the 'select my version' option:

[[[
Conflict for property 'p1' discovered on 'foo'.
local edit, incoming edit upon update
Select: (p) postpone, (mf) my version, (tf) their version,
        (dc) display conflict, (e) edit property, (r) resolved,
        (q) quit resolution, (h) help: dc
<<<<<<< MINE
edited prop val
||||||| ORIGINAL
v=======
v2>>>>>>> THEIRS
Select: (p) postpone, (mf) my version, (tf) their version,
        (dc) display conflict, (e) edit property, (r) resolved,
        (q) quit resolution, (h) help: mf
[...]
$ svn pl -v foo
Properties on 'foo':
  p1
    me
]]]

I'm going to vote +1 on the r1477294 group of back-ports that you proposed, where this change is listed as a 'small follow-up fix', because basically the changes are good and this is just a small inconsistency by comparison, and because the proposal involves a UI change which needs to get into 1.8.0 if it's going to get anywhere soon.

But I think we should do something to make this consistent with text conflicts, one way or the other.

- Julian

>
> * subversion/svn/conflict-callbacks.c
>   (show_prop_conflict, merge_prop_conflict): Add merged_abspath parameter.
>   Use it as 'my' version if non-NULL.
>   (edit_prop_conflict): For now, pass NULL for the merged file to
>   merge_prop_conflict(), so that repeated edits always start with
>   the same original values. This behaviour can be reconsidered later.
>   (handle_prop_conflict): Pass the path to the merged file, which might be
>   NULL, to show_prop_conflict().
Received on 2013-05-13 23:12:41 CEST

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