Right. However, it sounds as if the commit preceding your new commit isn't upstream on the central server. It needs to be, or you need to use --parent. Also, your origin must match the server configured in Review Board.
Christian -- Christian Hammond - chip...@chipx86.com Review Board - http://www.reviewboard.org VMware, Inc. - http://www.vmware.com On Fri, Jan 14, 2011 at 3:32 PM, Sapna Vempati <sapnavemp...@gmail.com> wrote: > Hi Christian, > > Here is the output. I should not be pushing the commit to the central server > yet..right ? > > $> post-review --debug >>>> svn info >>>> git rev-parse --git-dir >>>> git symbolic-ref -q HEAD >>>> git svn info >>>> git svn --version >>>> git config --get svn-remote.svn.url >>>> git config --get branch.SDB_BOND_SS_froyo.merge >>>> git config --get branch.SDB_BOND_SS_froyo.remote >>>> git config remote.mobcom-git.url >>>> repository info: Path: >>>> git://mobcom-git.sj.broadcom.com/git_repos/repo_tools/scripts.git, Base >>>> path: , Supports changesets: False >>>> git config --get reviewboard.url >>>> git merge-base mobcom-git/SDB_BOND_SS_froyo refs/heads/SDB_BOND_SS_froyo >>>> git diff --no-color --full-index >>>> 215fe632aa20f1946657f0f9f152ba1e9792426b..refs/heads/SDB_BOND_SS_froyo >>>> Looking for 'mob-rb-test.sj.broadcom.com /' cookie in >>>> /home/svempati/.post-review-cookies.txt >>>> Loaded valid cookie -- no login required >>>> Attempting to create review request on >>>> git://mobcom-git.sj.broadcom.com/git_repos/repo_tools/scripts.git for None >>>> HTTP POSTing to >>>> http://mob-rb-test.sj.broadcom.com/api/json/reviewrequests/new/: >>>> {'repository_path': >>>> 'git://mobcom-git.sj.broadcom.com/git_repos/repo_tools/scripts.git'} >>>> Review request created >>>> Uploading diff, size: 548 >>>> HTTP POSTing to >>>> http://mob-rb-test.sj.broadcom.com/api/json/reviewrequests/111/diff/new/: >>>> {} >>>> Got API Error 105 (HTTP code 200): One or more fields had errors >>>> Error data: {'fields': {'path': ['error: unable to find >>>> b05f0d0f11ebb6517607f74801222f8da1e9729c\nfatal: git cat-file >>>> b05f0d0f11ebb6517607f74801222f8da1e9729c: bad file\n']}, 'stat': 'fail', >>>> 'err': {'msg': 'One or more fields had errors', 'code': 105}, 'deprecated': >>>> {'in_version': '1.5'}} > > Thanks, > Sapna > > On Fri, Jan 14, 2011 at 3:24 PM, Christian Hammond <chip...@chipx86.com> > wrote: >> >> Can you run with --debug but not --output-diff and show me what it says? >> >> Christian >> >> -- >> Christian Hammond - chip...@chipx86.com >> Review Board - http://www.reviewboard.org >> VMware, Inc. - http://www.vmware.com >> >> >> >> On Fri, Jan 14, 2011 at 3:10 PM, Sapna Vempati <sapnavemp...@gmail.com> >> wrote: >> > Thanks Christian for your quick response. >> > >> > I got this same error even after I created the topic branch + add + >> > commit >> > the changes in my repo. >> > >> > Anything else could be wrong ? I am not able to figured out based on >> > this >> > below output log. >> > >> > $> git checkout -b SDB_BOND_SS_froyo mobcom-git/SDB_BOND_SS_froyo >> > $> git add brcm_froyo_buildall.sh >> > $>git commit -m "ReviewBrd test" >> > $> post-review --output-diff --debug >> >>>> svn info >> >>>> git rev-parse --git-dir >> >>>> git symbolic-ref -q HEAD >> >>>> git svn info >> >>>> git svn --version >> >>>> git config --get svn-remote.svn.url >> >>>> git config --get branch.SDB_BOND_SS_froyo.merge >> >>>> git config --get branch.SDB_BOND_SS_froyo.remote >> >>>> git config remote.mobcom-git.url >> >>>> repository info: Path: >> >>>> git://mobcom-git.sj.broadcom.com/git_repos/repo_tools/scripts.git, >> >>>> Base >> >>>> path: , Supports changesets: False >> >>>> git config --get reviewboard.url >> >>>> git merge-base mobcom-git/SDB_BOND_SS_froyo >> >>>> refs/heads/SDB_BOND_SS_froyo >> >>>> git diff --no-color --full-index >> >>>> >> >>>> 215fe632aa20f1946657f0f9f152ba1e9792426b..refs/heads/SDB_BOND_SS_froyo >> > diff --git a/brcm_froyo_buildall.sh b/brcm_froyo_buildall.sh >> > index >> > >> > b05f0d0f11ebb6517607f74801222f8da1e9729c..effd468723cf5ec0e2af88dea1d5c7d971165839 >> > 100755 >> > --- a/brcm_froyo_buildall.sh >> > +++ b/brcm_froyo_buildall.sh >> > @@ -1,5 +1,6 @@ >> > #!/bin/bash >> > >> > +#test RB >> > CHIP=bcm21553 >> > BOARD=thunderbirdEDN31 >> > VERSION=0.3 >> > @@ -166,4 +167,4 @@ elif [ "${BUILD_SITE}" == "BLR" ]; then >> > elif [ "${BUILD_SITE}" == "Ubuntu" ]; then >> > LSF_QUEUE="blr-mob-android" >> > ./brcm_tools/scripts/make_lk_android_build.sh -C $CHIP -P $BOARD >> > -fi >> > \ No newline at end of file >> > +fi >> > >> > Thanks ! >> > Sapna >> > >> > >> > On Fri, Jan 14, 2011 at 2:14 PM, Christian Hammond <chip...@chipx86.com> >> > wrote: >> >> >> >> Hi Sapna, >> >> >> >> The post-review script you're seeing is the installed wrapper that >> >> invokes the real post-review script, which lives in the >> >> RBTools-versionnumber.egg. You shouldn't have to touch the file. >> >> >> >> The solution is actually provided right there in the error. For a diff >> >> to be generated for a file, it must be in Git's index, which means you >> >> must 'git add' and 'git commit' the files. That commit will be contain >> >> the diff that will be uploaded. >> >> >> >> My workflow is: >> >> >> >> 1) Create a topic branch for the change I want to put up for review. >> >> 2) Commit the changes there. >> >> 3) Run post-review (I use --guess-summary and --guess-description, >> >> which will auto-populate those fields based on the commit >> >> descriptions). >> >> >> >> Note that post-review will generate the diff between the closest >> >> commit on origin to the most recent commit. That is, it'll do a 'git >> >> diff remotes/origin/master' or some such, generally. You can use the >> >> --parent= parameter to specify a branch or SHA1 that you want as the >> >> parent, which means that every commit since that branch/SHA1 will be >> >> included in the diff, but no changes before that commit. >> >> >> >> Christian >> >> >> >> -- >> >> Christian Hammond - chip...@chipx86.com >> >> Review Board - http://www.reviewboard.org >> >> VMware, Inc. - http://www.vmware.com >> >> >> >> >> >> >> >> On Fri, Jan 14, 2011 at 1:48 PM, Sapna Vempati <sapnavemp...@gmail.com> >> >> wrote: >> >> > Hi, >> >> > >> >> > We installed RB 1.5.1/RB tools/restarted apache on our server. I am >> >> > able >> >> > to >> >> > configure a repo successfully through RB web location. I try to post >> >> > a >> >> > review, I can post it for review, but cannot attach the diff. >> >> > >> >> > $> clone repo >> >> > $> cd <repo> >> >> > $> git config reviewboard.url <RB web url> >> >> > $> modify file >> >> > $> git status >> >> > # On branch master >> >> > # Changed but not updated: >> >> > # (use "git add <file>..." to update what will be committed) >> >> > # >> >> > # modified: brcm_eclair_buildall.sh >> >> > # >> >> > no changes added to commit (use "git add" and/or "git commit -a") >> >> > $> post-review -p >> >> > Error uploading diff >> >> > The generated diff file was empty. This usually means no files were >> >> > modified in this change. >> >> > Try running with --output-diff and --debug for more information. >> >> > Your review request still exists, but the diff is not attached. >> >> > >> >> > I look at the post-review script that we have, and it looks like >> >> > below, >> >> > instead of the long script(.py) that should have around 3000 lines of >> >> > code. >> >> > >> >> > $> which post-review >> >> > /opt/lampp/bin/post-review >> >> > $> cat /opt/lampp/bin/post-review >> >> > #!/projects/mob_tools/xampp/1.6.4-brcm-v2/bin/python >> >> > # EASY-INSTALL-ENTRY-SCRIPT: >> >> > 'RBTools==0.2','console_scripts','post-review' >> >> > __requires__ = 'RBTools==0.2' >> >> > import sys >> >> > from pkg_resources import load_entry_point >> >> > sys.exit( >> >> > load_entry_point('RBTools==0.2', 'console_scripts', >> >> > 'post-review')() >> >> > ) >> >> > Can you please help on what I am missing in the >> >> > configuration/procedure >> >> > ? Do >> >> > I need to update the post-review code ? >> >> > >> >> > Thanks, >> >> > Sapna >> >> > >> >> > -- >> >> > Want to help the Review Board project? Donate today at >> >> > http://www.reviewboard.org/donate/ >> >> > Happy user? Let us know at http://www.reviewboard.org/users/ >> >> > -~----------~----~----~----~------~----~------~--~--- >> >> > To unsubscribe from this group, send email to >> >> > reviewboard+unsubscr...@googlegroups.com >> >> > For more options, visit this group at >> >> > http://groups.google.com/group/reviewboard?hl=en >> >> >> >> -- >> >> Want to help the Review Board project? Donate today at >> >> http://www.reviewboard.org/donate/ >> >> Happy user? Let us know at http://www.reviewboard.org/users/ >> >> -~----------~----~----~----~------~----~------~--~--- >> >> To unsubscribe from this group, send email to >> >> reviewboard+unsubscr...@googlegroups.com >> >> For more options, visit this group at >> >> http://groups.google.com/group/reviewboard?hl=en >> > >> > -- >> > Want to help the Review Board project? Donate today at >> > http://www.reviewboard.org/donate/ >> > Happy user? Let us know at http://www.reviewboard.org/users/ >> > -~----------~----~----~----~------~----~------~--~--- >> > To unsubscribe from this group, send email to >> > reviewboard+unsubscr...@googlegroups.com >> > For more options, visit this group at >> > http://groups.google.com/group/reviewboard?hl=en >> >> -- >> Want to help the Review Board project? Donate today at >> http://www.reviewboard.org/donate/ >> Happy user? Let us know at http://www.reviewboard.org/users/ >> -~----------~----~----~----~------~----~------~--~--- >> To unsubscribe from this group, send email to >> reviewboard+unsubscr...@googlegroups.com >> For more options, visit this group at >> http://groups.google.com/group/reviewboard?hl=en > > -- > Want to help the Review Board project? Donate today at > http://www.reviewboard.org/donate/ > Happy user? Let us know at http://www.reviewboard.org/users/ > -~----------~----~----~----~------~----~------~--~--- > To unsubscribe from this group, send email to > reviewboard+unsubscr...@googlegroups.com > For more options, visit this group at > http://groups.google.com/group/reviewboard?hl=en -- Want to help the Review Board project? Donate today at http://www.reviewboard.org/donate/ Happy user? Let us know at http://www.reviewboard.org/users/ -~----------~----~----~----~------~----~------~--~--- To unsubscribe from this group, send email to reviewboard+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/reviewboard?hl=en
