My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3354: submodule move to below its old location makes non-mergeable commit
1 person starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Reported by pgeo...@google.com, May 5, 2015
I just built a commit in which a submodule was renamed to be located below its original location (ie a/ -> a/foo).
git mv required two steps (git mv a foo; mkdir a; git mv foo a/foo), but accepted the change.

The commit with git (also on other checkouts), but gerrit claims it 'Cannot Merge' the change, and I see no other reason for it to refuse to merge it (cherry-pick strategy, in case this makes a difference).

See http://review.coreboot.org/#/c/10106/

May 6, 2015
#1 pgeo...@google.com
To add: I worked around this using two commits (git mv a foo; git commit; mkdir a; git mv foo a/foo), and merged those changes.

Gerrit now marks all commits don't contain this change as merge conflict, no matter if they touch a, foo or a/foo.
Sign in to add a comment

Powered by Google Project Hosting