Thanks for your analyze, we also have this problem when add .gitattributes file and remove the repository in gitlab-satellites, mr works ok now
在 2014年12月4日星期四 UTC+8下午8:26:44，Ben Sims写道： > > For ref: This was caused by us adding a .gitattributes file. The Gitlab > satellites directory clone of the target repository could not then change > away from the rc branch as the .gitattributes caused some files to change > on checkout. I guess that failure isn't caught as gitlab then tries to > delete rc branch but fails. > > Removing the satellite clone repository worked as it meant it was all was > re-cloned on the next merge request. So far the problem hasn't recurred but > I guess it might until we normalise all our files line endings to match the > .gitattributes. > > Ben > > On Wednesday, 26 November 2014 13:20:10 UTC, Ben Sims wrote: >> >> >> Hi, >> We are periodically seeing a problem creating merge requests in Gitlab >> 7.1. The merge page unexpectedly reports that there are no changes between >> the branches. >> >> The merge is from a bugfix branch of develop on a developers fork of the >> official repository to develop on the official repository. >> >> In githost.log this error is printed at the same time as trying to >> compare the branches: >> >> >> November 26, 2014 11:24 -> ERROR -> Command failed [1]: /usr/bin/git >> --git-dir=/repo/gitlab-satellites/company/project/.git >> --work-tree=/repo/gitlab-satellites/company/project branch -D rc >> >> error: Cannot delete the branch 'rc' which you are currently on. >> >> >> rc is branched from develop and regularly merged back into develop in the >> official repository. >> >> It seemed that gitlabs merge screen started working again once the >> developer had pushed rc and develop branches to his origin repository as >> well as the bugfix branch. But this doesn't seem to be 100% fix for the >> problem. >> >> Could anyone say if this a known issue or if there is a way to fix it. >> There is a stack overflow question >> http://stackoverflow.com/questions/25133398/can-not-do-merge-request-on-gitlab >> >> which seems relevant but isn't entirely clear. >> >> Cheers >> >> Ben >> >> >> >> >> >> -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to gitlabhq+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/2d76ca83-babd-44cd-b99b-969300af0306%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
