Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 350852 - Overlapping branches in the history graph
Summary: Overlapping branches in the history graph
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.0   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: 1.2   Edit
Assignee: Christian Halstrick CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-06-30 11:16 EDT by Marc Khouzam CLA
Modified: 2011-12-09 09:43 EST (History)
4 users (show)

See Also:

Attachments
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 Marc Khouzam CLA 2011-06-30 11:16:28 EDT 
On the CDT project, I display the repository in the History view and the graph shows the origin/master and origin/cdt_7_0 lines as a single line.

I originally thought someone had merged the two branches together!  But when I looked at the parent/child ids of commits, which are correct, I realized it was only the graph that was wrong.

Note that gitk does not have this problem. 

This may be a duplicate of Bug 335818.
Comment 1 Christian Halstrick CLA 2011-12-06 09:12:29 EST 
Rendering history is/was fixed with http://egit.eclipse.org/r/#change,4744 and http://egit.eclipse.org/r/#change,4735. I checked it with CDT and the mentionend branches and it looks good now.
When http://egit.eclipse.org/r/#change,4744 is accepted I'll close this bug unless you find some problems with the proposal.
Comment 2 Christian Halstrick CLA 2011-12-08 05:56:58 EST 
This has been fixed with commit 251bc02840a2e722a6cf660e4adde0e63d3d2de1
Comment 3 Marc Khouzam CLA 2011-12-08 13:46:30 EST 
What is the Target Milestone for this fix?
Comment 4 Christian Halstrick CLA 2011-12-09 09:43:13 EST 
This should go into EGit 1.2 which currently beeing prepared.