On Sun, Feb 05, 2017 at 03:23:33PM +0100, Stefan Küng wrote:
> Still doesn't work for me.
>
> svn_client_conflict_option_set_moved_to_repos_relpath(opt, j, scratchpool);
> label = svn_client_conflict_option_get_label(opt, scratchpool);
> description = svn_client_conflict_option_get_description(opt, scratchpool);
>
> setting the moved-to path and then getting the description again does not
> update the description nor the label.
>
> Stefan
Yes, there were still some bugs to fix. As of r1781889, it works as expected
for me. See the transcript below. I have added annotations in square brackets
like this: [[ ... ]] so you can more easily follow which behaviour I am
focussing on.
The tested conflict situation is as follows:
A working copy at r2 with an edited file 'alpha' was updated to r3.
In this test repository, r3 looks like this:
$ svn log -v -q -r3
------------------------------------------------------------------------
r3 | stsp | 2017-02-04 19:41:28 +0100 (Sat, 04 Feb 2017)
Changed paths:
D /trunk/alpha
A /trunk/alpha2 (from /trunk/alpha:2)
A /trunk/alpha3 (from /trunk/alpha:2)
------------------------------------------------------------------------
$ svn resolve
Searching tree conflict details for 'alpha' in repository:
Checking r3... done
Tree conflict on 'alpha':
File updated from r2 to r3 was moved to '^/trunk/alpha2' by stsp in r3.
A file containing uncommitted changes was found in the working copy.
Select: (p) Postpone, (r) Mark as resolved, (m) Move and merge,
(d) Set repository move destination path, (h) Help,
(q) Quit resolution: h
File updated from r2 to r3 was moved to '^/trunk/alpha2' by stsp in r3.
A file containing uncommitted changes was found in the working copy.
(p) - skip this conflict and leave it unresolved [postpone]
(r) - accept current working copy state [working]
(m) - move and merge local changes from 'alpha' into 'alpha2'
[[ At this point, the move target candidate is 'trunk/alpha2' and both
the conflict description and the "m" option show this path. ]]
(d) - pick repository move target from list of possible targets
(h) - show this help (also '?')
(q) - postpone all remaining conflicts
Words in square brackets are the corresponding --accept option arguments.
Select: (p) Postpone, (r) Mark as resolved, (m) Move and merge,
(d) Set repository move destination path, (h) Help,
(q) Quit resolution: d
Possible repository destinations for moved-away 'alpha' are:
(1): '^/trunk/alpha2'
(2): '^/trunk/alpha3'
Only one destination can be a move; the others are copies.
Specify the correct move target path by number: 2
[[ Here, the user has chosen to use alpha3 as the move target.
From now on, the move target candidate is 'trunk/alpha3' and both
the conflict description and the "m" option show this path. ]]
Select: (p) Postpone, (r) Mark as resolved, (m) Move and merge,
(d) Set repository move destination path, (h) Help,
(q) Quit resolution: h
File updated from r2 to r3 was moved to '^/trunk/alpha3' by stsp in r3.
A file containing uncommitted changes was found in the working copy.
(p) - skip this conflict and leave it unresolved [postpone]
(r) - accept current working copy state [working]
(m) - move and merge local changes from 'alpha' into 'alpha3'
(d) - pick repository move target from list of possible targets
(h) - show this help (also '?')
(q) - postpone all remaining conflicts
Words in square brackets are the corresponding --accept option arguments.
Select: (p) Postpone, (r) Mark as resolved, (m) Move and merge,
(d) Set repository move destination path, (h) Help,
(q) Quit resolution:
