interactive conflicts suppressed after choosing 'mf' or 'tf' on tree conflict

Hi All,

We are seeing some unusual functionality with svn when merging trunk to a branch. The interactive conflict prompt gets suppressed if select anything other than ‘p’ for postpone on the first conflict, which is a tree conflict.

We are using the following version:

svn, version 1.8.3 (r1516576)

   compiled Sep 25 2013, 12:21:38 on x86_64-apple-darwin12.4.0

Copyright (C) 2013 The Apache Software Foundation.

This software consists of contributions made by many people;

see the NOTICE file for more information.

Subversion is open source software, see http://subversion.apache.org/

The following repository access (RA) modules are available:

* ra_svn : Module for accessing a repository using the svn network protocol.

  - with Cyrus SASL authentication

  - handles 'svn' scheme

* ra_local : Module for accessing a repository on local disk.

  - handles 'file' scheme

* ra_serf : Module for accessing a repository via WebDAV protocol using serf.

  - using serf 1.2.1

  - handles 'http' scheme

  - handles 'https' scheme

The first conflict we are seeing is a tree conflict and there are a number of subsequent tree and text conflicts. If we choose to postpone the tree conflict then all the subsequent prompts appear as expected:

$ svn merge ^/trunk/myproject .

--- Merging r7866 through r9333 into '.':

 U mydir1/build.properties

 U mydir1/build.xml

…

Conflict discovered when trying to add ‘mydir2/mysubdir'.

An object of the same name already exists.

Select: (mf) my version, (tf) their version, (p) postpone,

        (q) quit resolution, (h) help: p

Conflict discovered in file ‘mydir3/myfile1.txt'.

Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,

        (mc) my side of conflict, (tc) their side of conflict,

        (s) show all options:

…

Conflict discovered in file 'mydir4/myfile2.txt'.

Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,

        (mc) my side of conflict, (tc) their side of conflict,

        (s) show all options: p

Summary of conflicts:

  Text conflicts: 15

  Tree conflicts: 2

However if we choose any other option than postpone on the first tree conflict then the subsequent conflict prompt are suppressed as though the —non-interactive option was used. There is also an error message at the bottom:

$ svn revert -R .

Reverted ‘.'

…

$ svn merge ^/trunk/myproject .

--- Merging r7866 through r9333 into '.':

 U mydir1/build.properties

 U mydir1/build.xml

…

Conflict discovered when trying to add ‘mydir2/mysubdir'.

An object of the same name already exists.

Select: (mf) my version, (tf) their version, (p) postpone,

        (q) quit resolution, (h) help: mf

Summary of conflicts:

  Text conflicts: 14 remaining (and 0 already resolved)

  Tree conflicts: 1 remaining (and 1 already resolved)

svn: E155027: Tree conflict can only be resolved to 'working' state; ‘/myfullpath/mydir2/mysubdir' not resolved

I’m guessing that the error at the bottom is probably causing the issue but should the the subsequent prompts be suppressed? Normally if I choose something invalid during the interactive conflicts it loops back to the prompt and gives me the reason the option was invalid.
Should something similar happen here? Or is this expected functionality? Would it be considered a bug?

Many Thanks,
Stefan
Received on 2014-02-28 17:05:09 CET