Re: [RFC] Issue #3322 - In tree conflict info, report left/right URL@REV of the incoming change

On Mon, 2008-11-17 at 18:04 +0000, Julian Foad wrote:
> I checked whether we're updating the base, and we are not. This comment
> in libsvn_wc/update_editor.c seems to be accurate:
>
> /*
> * [*3] For now, we skip the update, and require the user to:
> * - Modify the WC to be compatible with the incoming change;
> * - Mark the conflict as resolved;
> * - Repeat the update.
> * Ideally, it would be possible to resolve any conflict without
> * repeating the update. To achieve this, we would have to store the
> * necessary data at conflict detection time, and delay the update of
> * the Base until the time of resolving.
> */

(Actually, the user actions described there are for how to get "theirs"
- the incoming change - and not "mine". To get "mine" or a merged
result, the user must do something more such as first save their change
and finally re-apply it.)

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-17 19:43:55 CET