| Summary: | [client] Rename appears as outgoing delete and create in git status page | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | John Arthorne <john.arthorne> |
| Component: | Git | Assignee: | Project Inbox <orion.git-inbox> |
| Status: | RESOLVED WONTFIX | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | remy.suen, simon_kaegi, Szymon.Brandys |
| Version: | unspecified | Keywords: | investigate |
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
| Bug Depends on: | 349168 | ||
| Bug Blocks: | |||
|
Description
John Arthorne
I have the same problem. I rename a file in branch A, modify the same file in branch B, and then do a merge, the branches are not correctly merged. With git commandline this works. "git mv" is nothing more than "mv {old} {new};git add {new};git rm {old}". In order this to work we would need to add some kind of a hook (something like org.eclipse.core.resources.team.TeamHook in Platform). Is there any other way?
With command line git this works without even using "git mv". I.e., if I move a file using Eclipse, command line, etc, then after adding the changes they show up in git status as moved. I assume they are using the file content hash to detect that they are the same file. Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see: https://dev.eclipse.org/mhonarc/lists/orion-dev/msg03444.html |