My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 76: Clean path merge failed to merge automatically
  Back to list
Status:  Released
Owner:  code-rev...@gtempaccount.com
Closed:  Oct 2012


Sign in to add a comment
 
Reported by code-rev...@gtempaccount.com, Sep 24, 2009
Reported by Shawn Pearce <sop@google.com> on Mon Feb 16 08:10:29 PST 2009
Source: JIRA GERRIT-76
Affected Version: 2.0.3

In Gerrit's own Git repository, patch set 1 of change 8896 should have merged
automatically.  It didn't.

master = 0b25c969e23d3ef23271fe83aca191eca4a1b3c1
patch set 1 = 5d9cc2f990a85a27c6ec71b54f380ff630353510

the only affected path should have merged cleanly.  I thought this was fixed
in JGit by 3ff4c5d52dee6983538bb1d04f759e4a3d40a7f0 ("Fix TreeWalk.idEqual
when both trees are missing the path").
Sep 24, 2009
#1 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Fri Feb 20 16:03:23 PST 2009

I've also heard from some kernel engineers that what is probably this same bug
is causing merges to fail in the linux kernel, when they should have succeeded
automatically.  *sigh*
Sep 24, 2009
#2 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Thu Mar 05 17:18:14 PST 2009
Blockedon: 95
Sep 24, 2009
#3 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Thu Mar 05 17:18:14 PST 2009

Fixes posted for GERRIT-95 also resolve this bug.
Sep 24, 2009
#4 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Thu Mar 05 17:18:16 PST 2009
Sep 24, 2009
#5 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Sat Mar 07 15:00:10 PST 2009

Fixed by https://review.source.android.com/9093
Sep 24, 2009
#6 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Sat Mar 07 15:00:10 PST 2009

Fixed in version 2.0.6.
Status: Fixed
Sep 25, 2009
#7 code-rev...@gtempaccount.com
(No comment was entered for this change.)
Labels: FixedIn-2.0.6
Oct 25, 2012
#8 sop@google.com
(No comment was entered for this change.)
Status: Released
Blockedon: -gerrit:95
Sign in to add a comment

Powered by Google Project Hosting