Troubles with cherry picking

Hi,

We work on a project utilizing Oracle Forms, which files are (sadly) binary. Today I wanted to merge last three changes of one form from our trunk to the test branch. I choose revision range to merge: "9830,9833,9982" (using Log window). Then on the next screen clicked "Test merge" button. The result was:
- properly merged first revision
- conflicts in the two following revisions (attached screenshot). Then I test it again merging revisions one by one with success. Eventually I reverted all changes and tested my approach using 3 different versions of command line:
c:\project\_tests>svn merge -c9830 -c9833 -c9982 http://svn/trunk
c:\project\_tests>svn merge -r9829:9830 -r9832:9833 -r9981:9982 http://svn/trunk
c:\project\_tests>svn merge -c9830,9833,9982 http://svn/trunk
All that works well.

It looks like something is wrong in the TortoiseSVN in this situation.

Best regards,
   Lukasz

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

• text/plain attachment: merge_success.txt