Community
Participate
Working Groups
1.2.0.201110021920 When looking at a certain commit which is only in one branch, I still see lots of other branches in the commit comment (History view) and in the Commit Viewer. This is very confusing as one could think that the fix is also in those branches and then one does not push it, which can results in bad things. Example: http://git.eclipse.org/c/platform/eclipse.platform.ui.git/commit/?id=b82e0e277a7f9ab0274efba11060dc150be89665 The commit does not say anything about branches (better than showing wrong info!). Now in EGit I see this: commit c3b72311b444196262aa8edb89dd67a2d7590054 Author: Paul Webster <pwebster> 2008-01-10 20:25:08 Committer: Paul Webster <pwebster> 2008-01-10 20:25:08 Child: 4d6feb964ea59f5346269c3351042ddafdc56c0f (Updated copyrights) Child: d98cf2c2e72159dee0c403899f4d223ad046bcda (This commit was manufactured by cvs2svn to create tag 'I20080226-0800b'.) Branches: origin/R3_7_maintenance, origin/R3_5_maintenance, origin/perf_34x, R3_development, origin/v20090820_e4merge, origin/R3_4_1_maintenance_patches, origin/sbrandys_M6afixes, origin/R3_4_maintenance_patches, origin/R3_6_maintenance, origin/R3_6_maintenance_patches, origin/R4_development, origin/R3_development, origin/R3_4_maintenance_patches_2, origin/R3_4_maintenance, origin/mhall_bug194734_properties, origin/I20080311-0800_demo_changes_for_rebuild, origin/R3_4_mainteance, origin/R3_6_p2_api_cleanup, origin/I20090803-1500_bug285794, origin/master, origin/R4_1_maintenance Bug 186522 [KeyBindings] New Keys preference page does not resort by binding with conflicts This is completely wrong, since that fix is not in all those branches.
> Now in EGit I see this: Sorry pasted wrong comment. The correct capture from EGit is: commit b82e0e277a7f9ab0274efba11060dc150be89665 Author: Markus Keller <mkeller> 2011-03-02 17:52:50 Committer: Markus Keller <mkeller> 2011-03-02 17:52:50 Parent: ab692e551d1294be53376745312555dd12d976d0 (Bug 333417: [KeyBindings] Rename "Workbench" context and hide if not supported) Branches: origin/R3_7_maintenance, R3_development, origin/R4_development, origin/R3_development, origin/master, origin/R4_1_maintenance Bug 283820: [Contexts] NPE on Keys preference page in ContextModel.filterContexts
Which specific branches were you not expecting that commit to be reported as present in? I tested a few and saw that commit appear in the git log output for all branches tried: git log --oneline origin/R3_development | grep b82e0e2 git log --oneline origin/R3_7_maintenance | grep b82e0e2 git log --oneline origin/R4_development | grep b82e0e2
It looks like I was looking at some file that (correctly) ended up in various branches. Sorry for the noise!
