Unsure about how to use javahl merge functions

Hi,

I'm writing a tool using the javahl API. What I need it to do is merge
a branch into a working copy that is equal to the latest trunk.
Basically, it should
behave like the svn cli client with the invocation 'svn merge <Branch-URL>',
the current directory being the working copy.

However, my attempts on using the merge functions of the javahl API for
this have
so far been unsuccessful. The changes in the trunk always get
overwritten by the
changes in the branch (they are on the same line of the file). But I
want it to
generate a conflict and create *.working, etc. files and put conflict markers
into the files.

How would one go about this? Is this even possible using the javahl-API?

Greetings

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414441

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-04 17:06:14 CET