On 1 March 2013 11:53, Łukasz Indeka <0h_at_wp.pl> wrote:
> 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.
Have you tried doing the real merge using TortoiseSVN? The results of
the test results are only an indication of where you might have
problems. If you try a test merge using the command line client I
think you will see the same thing.
Also, there is no way to merge changes in binary files automatically
using subversion (or any other revision control system). All it can do
is replace the old version with the new one. If there have been other
changes in the meantime it will generate a conflict, and if you force
the merge the other changes will be discarded.
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3050114
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-03-01 13:49:59 CET