Thanks, Chip! I didn't know that would be a problem.
If you know off hand, can you tell me how to do a squash? Thanks again! On Tue, May 28, 2013 at 11:51 AM, Chip Childers <chip.child...@sungard.com>wrote: > Mike - the problem is that you have two patches (2 commits) in the same > patch file. > > Here's what to do (choose 1): > > 1) Squash down to 1 commit / patch and submit it. > > OR > > 2) Create a review for the first patch, and then a follow up review for > the second patch. > > > On Mon, May 27, 2013 at 07:27:13PM -0600, Mike Tutkowski wrote: > > Yeah, I certainly agree with you, John. > > > > Any thoughts on what I might do to make Review Board work in my > situation? > > > > I am new to Review Board and don't know why my patch file won't upload, > but > > does apply to a new branch in my local repo. > > > > Thanks! > > > > > > On Mon, May 27, 2013 at 7:24 PM, John Burwell <jburw...@basho.com> > wrote: > > > > > Mike, > > > > > > I would encourage Review Board as the first preference. It provides a > > > good medium to review code and encourage other project members to > > > review patches, as well as, observe the review process. > > > > > > Thanks, > > > -John > > > > > > > > > > > > > > > On May 27, 2013, at 8:42 PM, Mike Tutkowski > > > <mike.tutkow...@solidfire.com> wrote: > > > > > > > Sounds good > > > > > > > > I have sent out an e-mail under the subject of "Patch File for Review > > > > (Storage Plug-in Related)". > > > > > > > > Thanks! > > > > > > > > I supposed we'll need to find out what wasn't working with Review > Board > > > if > > > > my next patch has similar trouble. :) > > > > > > > > > > > > On Mon, May 27, 2013 at 6:24 PM, Chip Childers < > > > chip.child...@sungard.com>wrote: > > > > > > > >> Can you send the patch to the list as a txt attachment with a > subject > > > >> line that indicates you want to have it reviewed and committed? > > > >> Perhaps we have to do this the old fashioned way. > > > >> > > > >> On May 27, 2013, at 7:46 PM, Mike Tutkowski > > > >> <mike.tutkow...@solidfire.com> wrote: > > > >> > > > >>> Regardless of those whitespace messages, it looks like my new > branch > > > >>> (solidfire_plugin2) does have the changes in the patch file (they > show > > > up > > > >>> as modified, but not staged files or - in the case of new files - > > > >> untracked > > > >>> files). > > > >>> > > > >>> > > > >>> On Mon, May 27, 2013 at 5:36 PM, Mike Tutkowski < > > > >>> mike.tutkow...@solidfire.com> wrote: > > > >>> > > > >>>> Thanks for the reply, Sebastien! > > > >>>> > > > >>>> So, I went ahead and updated from upstream again and merged > > > >>>> upstream/master to master, then merged master to solidfire_plugin. > > > >>>> > > > >>>> I created another patch file and tried to upload it to Review > Board, > > > but > > > >>>> received the same error message. > > > >>>> > > > >>>> I then tried to apply the patch file to a new branch, called > > > >>>> solidfire_plugin2, that I created off of master. > > > >>>> > > > >>>> There was no error output when I did an apply --check, but when I > > > >> actually > > > >>>> tried to apply the patch I received the following output (any > > > >> thoughts?): > > > >>>> > > > >>>> mtutkowski-LT:cloudstack mtutkowski$ git apply > solidfire_plugin.patch > > > >>>> solidfire_plugin.patch:66: trailing whitespace. > > > >>>> > > > >>>> solidfire_plugin.patch:68: trailing whitespace. > > > >>>> > > > >>>> solidfire_plugin.patch:70: trailing whitespace. > > > >>>> > > > >>>> solidfire_plugin.patch:72: trailing whitespace. > > > >>>> > > > >>>> solidfire_plugin.patch:74: trailing whitespace. > > > >>>> > > > >>>> warning: squelched 708 whitespace errors > > > >>>> warning: 713 lines add whitespace errors. > > > >>>> > > > >>>> > > > >>>> On Mon, May 27, 2013 at 1:45 AM, Sebastien Goasguen < > run...@gmail.com > > > >>> wrote: > > > >>>> > > > >>>>> > > > >>>>> On May 27, 2013, at 1:55 AM, Mike Tutkowski < > > > >> mike.tutkow...@solidfire.com> > > > >>>>> wrote: > > > >>>>> > > > >>>>>> Hi everyone, > > > >>>>>> > > > >>>>>> I'm trying to submit code for the first time. > > > >>>>>> > > > >>>>>> I'm following the instructions here: > > > >> > > > > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Review+Board+Guidelines > > > >>>>>> > > > >>>>>> When it says to upload my diff, I assume it means my .patch > file. Is > > > >>>>> that > > > >>>>>> correct? > > > >>>>>> > > > >>>>>> I generate such a file this way: > > > >>>>>> > > > >>>>>> git format-patch upstream/master --stdout > > solidfire_plugin.patch > > > >>>>> > > > >>>>> That should work. I usually just do: > > > >>>>> git format-patch master --stdout > my.patch > > > >>>>> > > > >>>>>> It works just fine, but when I try to upload it by clicking on > the > > > >>>>> Create > > > >>>>>> Review Request button, I get the following error: > > > >>>>>> > > > >>>>>> The file > > > >> > > > > 'plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java' > > > >>>>>> (r5f45a62) could not be found in the repository > > > >>>>>> * > > > >>>>>> * > > > >>>>> > > > >>>>> Create a fresh branch out of your local master and try to see if > your > > > >>>>> patch applies cleanly: > > > >>>>> git --check apply ( I think). > > > >>>>> > > > >>>>> Maybe it's a relative path issue (just a wild guess). > > > >>>>> > > > >>>>> > > > >>>>>> I'm not sure why it says this because this file is a part of the > > > >> current > > > >>>>>> repository. > > > >>>>>> > > > >>>>>> Would someone be able to explain what I might be doing wrong > here? > > > >>>>>> > > > >>>>>> I did update from the ACS repo and merge its master (my > > > >> upstream/master) > > > >>>>>> into my solidfire_plugin branch recently. After doing this, I > > > >> committed > > > >>>>> the > > > >>>>>> changes and made my .patch file. > > > >>>>> > > > >>>>> Did you check your patch making sure that all changed files were > > > >> staged ? > > > >>>>> > > > >>>>> I always do a git status -s , it's very helpful. > > > >>>>> > > > >>>>>> Thanks! > > > >>>>>> > > > >>>>>> -- > > > >>>>>> *Mike Tutkowski* > > > >>>>>> *Senior CloudStack Developer, SolidFire Inc.* > > > >>>>>> e: mike.tutkow...@solidfire.com > > > >>>>>> o: 303.746.7302 > > > >>>>>> Advancing the way the world uses the > > > >>>>>> cloud<http://solidfire.com/solution/overview/?video=play> > > > >>>>>> *™* > > > >>>> > > > >>>> > > > >>>> -- > > > >>>> *Mike Tutkowski* > > > >>>> *Senior CloudStack Developer, SolidFire Inc.* > > > >>>> e: mike.tutkow...@solidfire.com > > > >>>> o: 303.746.7302 > > > >>>> Advancing the way the world uses the cloud< > > > >> http://solidfire.com/solution/overview/?video=play> > > > >>>> *™* > > > >>> > > > >>> > > > >>> > > > >>> -- > > > >>> *Mike Tutkowski* > > > >>> *Senior CloudStack Developer, SolidFire Inc.* > > > >>> e: mike.tutkow...@solidfire.com > > > >>> o: 303.746.7302 > > > >>> Advancing the way the world uses the > > > >>> cloud<http://solidfire.com/solution/overview/?video=play> > > > >>> *™* > > > > > > > > > > > > > > > > -- > > > > *Mike Tutkowski* > > > > *Senior CloudStack Developer, SolidFire Inc.* > > > > e: mike.tutkow...@solidfire.com > > > > o: 303.746.7302 > > > > Advancing the way the world uses the > > > > cloud<http://solidfire.com/solution/overview/?video=play> > > > > *™* > > > > > > > > > > > -- > > *Mike Tutkowski* > > *Senior CloudStack Developer, SolidFire Inc.* > > e: mike.tutkow...@solidfire.com > > o: 303.746.7302 > > Advancing the way the world uses the > > cloud<http://solidfire.com/solution/overview/?video=play> > > *™* > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud<http://solidfire.com/solution/overview/?video=play> *™*
