> 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.
Today I finally found a moment to test it again after updating
to revision just before the merge. It looks like we didn't do the real
merge. Test merge (aka dry-run) from command line also shows conflicts.
So now my question is: is that normal situation that test merge has
results different from the real one? Is it a bug or is it by design?
I suppose that the conflict in the test comes from properties not being
changed (or written) after the merge of the first revision. Am I right?
> 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.
I'm aware of that. That was the exact reason of cherry picking. I've taken
all revisions changing this particular file since the last merge.
Łukasz
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3050370
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-03-05 17:43:54 CET