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

TSVN 1.8 strange merge error: Invalid 'conflict_result' argument

From: Gunnar Dalsnes <hardon_at_online.no>
Date: Wed, 19 Jun 2013 16:35:54 +0200

[Merge failed!]

Command: Merging revisions 24211-24212 of <secret>, respecting ancestry
Merging r24212: <secret>
Conflicted: <secret>.cs
Conflicted: <secret>.cs
Merged: <secret>
Recording mergeinfo for merge of r24212: <secret>
Updated: <secret>
Error: Invalid 'conflict_result' argument
Completed!

This is 32bit TSVN on WinXP

Gunnar.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-19 16:36:03 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.