[jira] [Comment Edited] (SVN-4663) Tree conflict problem when merging two branches

["André Roy (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/SVN-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15752437#comment-15752437 ] 

André Roy edited comment on SVN-4663 at 12/15/16 8:33 PM:
----------------------------------------------------------

Added transcript for reproducing the error.   Thanks Branko!


was (Author: andre@dsa-ltd.ca):
Transcript for reproducing the error.   Thanks Branko!

> Tree conflict problem when merging two branches
> -----------------------------------------------
>
>                 Key: SVN-4663
>                 URL: https://issues.apache.org/jira/browse/SVN-4663
>             Project: Subversion
>          Issue Type: Bug
>    Affects Versions: 1.9.4, 1.9.5
>         Environment: Windows, TortoiseSVN, Command line
>            Reporter: André Roy
>         Attachments: repeat.sh, transcript-1.9.4.txt, transcript-trunk.sh
>
>
> Bug confirmed by Branko Čibej <br...@apache.org> on users mailing list.
> Quick verbal description of how to recreate the issue:
> -Create a repository (with trunk/tags/branches structure), 
> -Checkout /trunk, 
> -Create branch1 in /branches/branch1, and checkout.
> -Create and checkout branch2.   
> -Create file.txt in Trunk + add + commit.  
> -Merge trunk changes into branch1 and commit.  
> -Merge trunk changes into branch2 and commit.  
> The problem: 
> -Merge branch1 changes into branch2, gives me a Tree conflict with file.txt.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)