356178 – Wrong history presentation

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

Bug 356178 - Wrong history presentation

Summary: Wrong history presentation

Status:	RESOLVED FIXED

Alias:	None

Product:	EGit
Classification:	Technology
Component:	UI (show other bugs)
Version:	1.0
Hardware:	PC Windows 7

Importance:	P3 normal (vote)
Target Milestone:	---
Assignee:	Project Inbox
QA Contact:

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2011-08-30 07:21 EDT by Michael Wenz
Modified:	2012-07-05 04:28 EDT (History)
CC List:	2 users (show)

See Also:

Attachments
Bash history view (section containing master) (223.85 KB, image/png) 2011-08-30 07:22 EDT, Michael Wenz	no flags	Details
Bash history view (section containing b0_8_x) (210.68 KB, image/png) 2011-08-30 07:22 EDT, Michael Wenz	no flags	Details
EGit history view (223.19 KB, image/png) 2011-08-30 07:23 EDT, Michael Wenz	no flags	Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Michael Wenz

2011-08-30 07:21:29 EDT

I stumbled over a layout issue in the EGit history view: one of our maintenance branches (b0_8_x) appears to include a branch containing a change that actually happened starting on master, lateron the master branch is merged back into master. This appears in the history view as if the b0_8_x branch is also merged with master.
The Git Bash shows the correct version graph.
I'll attach screenshots both from the EGit history view and from the Git Bash history view (2 seperate ones because it does not fit on one screen). Also my local Git repository is attached as a ZIP file.

Thanks to Matthias for helping to find the real issue.

Michael

Comment 1 Michael Wenz

2011-08-30 07:22:22 EDT

Created attachment 202404 [details]
Bash history view (section containing master)

Comment 2 Michael Wenz

2011-08-30 07:22:58 EDT

Created attachment 202405 [details]
Bash history view (section containing b0_8_x)

Comment 3 Michael Wenz

2011-08-30 07:23:25 EDT

Created attachment 202406 [details]
EGit history view

Comment 4 Michael Wenz

2011-08-30 07:38:23 EDT

I wasn't able to attach my repository ZIP (too large - 8MB) so I uploaded it here:
http://archive.eclipse.org/graphiti/bug356178/Repository.zip . It'll stay there for a while.

Michael

Comment 5 Remy Suen

2011-09-01 09:02:41 EDT

Also see bug 335818 and bug 340693.

Comment 6 Christian Halstrick

2012-07-05 04:28:39 EDT

This problem is fixed since months. From 1.3 (Dec. 2011) onwards I see that a correctly rendered history on the attached repository. Therefore I'll close this now.