Thanks a lot, Chip! That did the trick.
I've definitely been picking up quite a bit about Git these past few days.
:)
On Tue, May 28, 2013 at 3:58 PM, Chip Childers wrote:
> In master: git fetch origin; git reset --hard origin/master
>
> Then git am filename
>
> Then do the rebase
>
> On May 28
In master: git fetch origin; git reset --hard origin/master
Then git am filename
Then do the rebase
On May 28, 2013, at 5:54 PM, Mike Tutkowski
wrote:
> So, I've merged master to my solidfire_plugin branch a couple times now (on
> different days over the past week or so). If I do a git rebase
So, I've merged master to my solidfire_plugin branch a couple times now (on
different days over the past week or so). If I do a git rebase -i HEAD~2,
it goes back to my most recent merge, then wants to squash all of the
commits I picked up from master for my next merge.
Not sure what to do here.
Thanks, Chip!
I was busy talking to a customer about CloudStack for a while, but should
be able to re-submit my patch soon.
On Tue, May 28, 2013 at 12:02 PM, Chip Childers
wrote:
> On Tue, May 28, 2013 at 11:57:32AM -0600, Mike Tutkowski wrote:
> > Thanks, Chip!
> >
> > I didn't know that would
On Tue, May 28, 2013 at 11:57:32AM -0600, Mike Tutkowski wrote:
> 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!
In your branch, do:
git rebase -i HEAD~2
You're editor will pull up something like the fol
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
wrote:
> Mike - the problem is that you have two patches (2 commits) in the same
> patch file.
>
> Here's what to do (ch
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 -
Hi John,
Here is a copy/paste of part of the e-mail chain.
Thanks!
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
Mike,
What error are you getting from Review Board? Have you rebased your
branch to master recently? Finally, are you submitting a squashed
patch?
Thanks,
-John
On May 27, 2013, at 9:27 PM, Mike Tutkowski
wrote:
> Yeah, I certainly agree with you, John.
>
> Any thoughts on what I might do to
I was going to use his attachment tomorrow, to figure out what's wrong
with review board. Agreed that its a preference!
On May 27, 2013, at 9:25 PM, John Burwell wrote:
> Mike,
>
> I would encourage Review Board as the first preference. It provides a
> good medium to review code and encourage o
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 wro
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
wrote:
> Sounds good
>
> I have se
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 wrote:
> Can yo
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
wrote:
> Regardless of those whitespace messages, it looks like my n
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...@solid
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 patc
On May 27, 2013, at 1:55 AM, Mike Tutkowski
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 mea
17 matches
Mail list logo
