1. Bitbucket
  2. Public Issue Tracker
  3. master
  4. Issues

Issues

Issue #7705 resolved

Cant merge PR's into AUI repo

Benjamin Wong
created an issue

Both of the PR's I've tried to merge today have given unexpected errors (see screenshot)

PR's I've tried to merge are:

https://bitbucket.org/atlassian/aui/pull-request/399/firebug-can-be-retrieved-over-https-so/diff

and

https://bitbucket.org/atlassian/aui/pull-request/395/aui-1430-fix-lozenge-text-alignment/diff

Comments (10)

  1. Benjamin Wong reporter

    Here's a dump from my web inspector of the request that failed:

    https://bitbucket.org/api/1.0/repositories/atlassian/aui/pullrequests/tasks/ed8ef612-b075-4be1-8f33-6c99af15f5e1

    **Headers:** 
    GET /api/1.0/repositories/atlassian/aui/pullrequests/tasks/ed8ef612-b075-4be1-8f33-6c99af15f5e1 HTTP/1.1
    Host: bitbucket.org
    Connection: keep-alive
    Cache-Control: no-cache
    Pragma: no-cache
    X-Requested-With: XMLHttpRequest
    User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.116 Safari/537.36
    Accept: */*
    If-None-Match: "7edbf01138c53321d8de433c3c6598f9"
    Referer: https://bitbucket.org/atlassian/aui/pull-request/395/aui-1430-fix-lozenge-text-alignment/diff
    Accept-Encoding: gzip,deflate,sdch
    Accept-Language: en-US,en;q=0.8
    optimizelySegments=%7B%22202765491%22%3A%22false%22%2C%22202916208%22%3A%22gc%22%2C%22202920152%22%3A%22referral%22%7D; optimizelyBuckets=%7B%7D; recently-viewed-repos_699150=432617%2C893335%2C1566651%2C108928%2C2558433; optimizelyPendingLogEvents=%5B%5D; __utma=254090395.1045212478.1370561384.1373326927.1373329808.56; __utmb=254090395.24.9.1373330238728; __utmc=254090395; __utmz=254090395.1370561384.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); __utmv=254090395.|1=isBBUser=true=1; 
    
    **Response**
    HTTP/1.1 500 INTERNAL SERVER ERROR
    Server: nginx/1.2.4
    Date: Tue, 09 Jul 2013 00:39:36 GMT
    Content-Type: text/html; charset=utf-8
    Content-Length: 7297
    Connection: keep-alive
    X-Served-By: app05
    X-Render-Time: 3.3361389637
    Content-Language: en
    X-Static-Version: a5c28b487823
    Vary: Accept-Language, Cookie
    X-Sentry-ID: 5f5929c1d2784614a2634ec67a6919be
    X-Version: a5c28b487823
    ETag: "9cd7499d280abb3f3c57069edba9aed5"
    X-Request-Count: 318
    

    I notice there's a GET request for the same URL that happens right before this one that returns 200 success. I've attached the full har file as well from that page.

  2. Benjamin Wong reporter

    This could be relevant:

    I just tried to push something from my local clone to a branch (docs) via ssh and I keep getting permission denied:

    Counting objects: 180, done.
    Delta compression using up to 16 threads.
    Compressing objects: 100% (119/119), done.
    Writing objects: 100% (120/120), 17.10 KiB, done.
    Total 120 (delta 95), reused 0 (delta 0)
    error: Unable to append to ./logs/refs/heads/docs: Permission denied
    To git@bitbucket.org:atlassian/aui.git
     ! [remote rejected] docs -> docs (failed to write)
    error: failed to push some refs to 'git@bitbucket.org:atlassian/aui.git'
    

    If i do it via https I just get this error:

    Counting objects: 180, done.
    Delta compression using up to 16 threads.
    Compressing objects: 100% (119/119), done.
    Writing objects: 100% (120/120), 17.10 KiB, done.
    Total 120 (delta 95), reused 0 (delta 0)
    To https://zephor@bitbucket.org/atlassian/aui.git
     ! [remote rejected] docs -> docs (failed to write)
    error: failed to push some refs to 'https://zephor@bitbucket.org/atlassian/aui.git'
    
  3. Benjamin Wong reporter

    Ok I just tried merging manually. did the merge locally and when I tried to push I got this:

    git push origin master
    Counting objects: 44, done.
    Delta compression using up to 16 threads.
    Compressing objects: 100% (23/23), done.
    Writing objects: 100% (24/24), 2.28 KiB, done.
    Total 24 (delta 13), reused 0 (delta 0)
    error: Unable to append to ./logs/refs/heads/master: Permission denied
    To git@bitbucket.org:atlassian/aui.git
     ! [remote rejected] master -> master (failed to write)
    error: failed to push some refs to 'git@bitbucket.org:atlassian/aui.git'
    

    Process was:

    1. add fork as remote (git remote add <fork url>)
    2. checkout branch to local branch (git checkout <remotebranch>; git branch <newbranchname>; git checkout <newbranchname>
    3. checkout master; (git checkout master)
    4. merge (git merge <newbranchname>)
    5. git push origin master

    Could this be related to the NTT migration? I seem to be able to create new branches it seems the old branches that were created before the NTT migration have some kind of permissions problem.

    We are planning to have a release this week along with the ADG's release so this has now become a blocker.

  4. Brian Nguyen

    Sorry fellas, looks like the permissions on some of the git files were set to root. I swear this happens to the AUI repo way too often.

    Anyway I fixed the files for the moment, so it should work again.

    Do you know of any tasks that could be causing this? We don't see this problem with other users so I'm guessing its something we've set up specifically for AUI.

  5. Benjamin Wong reporter

    hmm I've been trying to think of what we've done recently to cause this. We haven't done anything out of our usual mode of operations. Could there be something in the merge process? If it happens to us only it must be related to how we're running this... could it also be related to all the forks of the repo that exist? or even the rename we did a few months back from aui-archive to aui.

    Just merged in a PR so all is well now, thanks for doing that.

  6. Log in to comment