Re: tortise svn: principal bug

On 04.12.2015 09:21, icegood wrote:
> Hi there!
> I guess, user expects that after executing 'Crerate patch/Apply patch'
> in case when conflict occur then such conflict should map to tortoise
> svn merge conflict. Why it doesn't happen???

Because a patch file only contains changes. It does not contain the
whole history and also not the ancestry of the changes. So it can not
create a conflict but simply fails to apply changes that don't match.

Stefan

-- 
        ___
   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=3149469
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].