Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 359561

Summary:

Internal error occurred while merging a removed file

Product:

[Technology] EGit

Reporter:

Jérôme de Vivie <jedevivie-ext>

Component:

Core

Assignee:

Project Inbox <egit.releng-inbox>

Status:

RESOLVED FIXED

QA Contact:

Severity:

normal

Priority:

CC:

remy.suen, robin.rosenberg

Version:

1.1

Target Milestone:

2.3

Hardware:

OS:

Windows XP

Whiteboard:

Attachments:

Description	Flags
screenshot of error	none
Error log	none

Description Jérôme de Vivie

2011-09-30 09:34:03 EDT

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

Comment 1 Jérôme de Vivie

2011-09-30 09:34:45 EDT

Created attachment 204379 [details]
screenshot of error

Comment 2 Jérôme de Vivie

2011-09-30 09:35:15 EDT

Created attachment 204380 [details]
Error log

Comment 3 Jérôme de Vivie

2011-09-30 11:12:25 EDT

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

Comment 4 Robin Rosenberg

2013-03-17 16:51:09 EDT

This was fixed in 2.2 or 2.3. Works now

Comment 5 Robin Rosenberg

2013-03-17 16:51:53 EDT

I.e the user gets a more friendly error