RE: Re: Re: Record only option is ignored while merging

> Now what merge do you use?

I used "Merge a range of revisions" on the first page of the merge dialog.
I have done this several times with the 1.7.x client with the same server.

The old "old style" check box is grayed out and unchecked. No reverse merge.

After some testing it seems the error only occurs when the revisions that should be record only merged cause a tree conflict.

I then get the following output. The merge info is changed but the dialog states "The operation failed".
We always merge between the top of a branch or the trunk.

Command: Merging revisions 45777-45778 of http://gs07:7080/svn_lv/ProductName/dev/branches/6.2.3_QA into X:\Projects\ProductName\trunk, respecting ancestry
Merging r45778: X:\Projects\ProductName\trunk
Tree conflict: X:\Projects\ProductName\trunk\PlugIns\Customizing\CustomizingPlugIn
Recording mergeinfo for merge of r45778: X:\Projects\ProductName\trunk
Updated: X:\Projects\ProductName\trunk
Error: The node
Error: 'X:\Projects\ProductName\trunk\PlugIns\Customizing\CustomizingPlugIn'
Error: was not found.
Completed!:

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3060485

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-07-15 13:41:51 CEST