Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 336087 - Merge dialog is misleading
Summary: Merge dialog is misleading
Status: CLOSED DUPLICATE of bug 366178
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Jens Baumgart CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-02-02 11:16 EST by Thomas Bieser CLA
Modified: 2013-09-27 12:28 EDT (History)
2 users (show)

See Also:


Attachments
Screenshot of misleading merge dialog (31.19 KB, image/png)
2011-02-02 11:17 EST, Thomas Bieser CLA
no flags Details
Screenshot of history at point of time where strange merge dialog comes up (9.12 KB, image/png)
2011-02-02 11:18 EST, Thomas Bieser CLA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Bieser CLA 2011-02-02 11:16:54 EST
Build Identifier: 0.10.1

Context:
- Setup: Remote repository is shared via file share 
- Changes on the remote machine are obtained via fetch from remote repository
- In the remote repository, changes are also fetch from my local
(So no push used)


Reproducible: Always

Steps to Reproduce:
1. Commited a trivial change to local master
2. Remote PC has fetched and merged this to own local master
3. Nothing was changed on both machines
3. Another fetch on local machine shows that there is a change even if there should be non (see history screenshot)
4. If I try to merge the remote origin/master to local master, then the attached merge dialog appears:
- Commits show up even if result is "up-to-date"
- Last commit shows up two times
Comment 1 Thomas Bieser CLA 2011-02-02 11:17:40 EST
Created attachment 188158 [details]
Screenshot of misleading merge dialog
Comment 2 Thomas Bieser CLA 2011-02-02 11:18:23 EST
Created attachment 188159 [details]
Screenshot of history at point of time where strange merge dialog comes up
Comment 3 Robin Stocker CLA 2013-09-27 12:28:34 EDT
Duplicate of bug 366178 (which includes a fix).

*** This bug has been marked as a duplicate of bug 366178 ***