Community
Participate
Working Groups
Build Identifier: eclipse.buildId=M20110210-1200 In branch "B", I've removed a file "toto" + commit. In branch "A", I've modified a file in filesystem but do not added it to index. When i merge branch "B" to "A", i get an internal error w/ a message difficult to assess. Reproducible: Always Steps to Reproduce: 1. From a repo w/ a file "toto" already under source control in branch "A", create a new branch "B" and checked it out. 2. Delete "toto" in branch "B" and commit change 3. Checked out back "A" branch and modify "toto" without adding it to index 4. Merge branch "B" into "A" Here attached, you will find a screenshot and error log. Could you have a look at it, pls ? Thank you BR Jérôme
Created attachment 204379 [details] screenshot of error
Created attachment 204380 [details] Error log
Same error occurs w/ the following steps: 1) adding + commiting a file into "B" branch 2) add a file w/ the same name in "A" branch and keep it just in filesystem 3) do merge of "B" into "A" BR Jérôme
This was fixed in 2.2 or 2.3. Works now
I.e the user gets a more friendly error
