Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
MIME-Version: 1.0
In-Reply-To: <27F36755-DB7A-4BD0-9CB1-E2FF6FC2DEB9@gmail.com>
References: <5632888A.9090708@artifact-software.com>
 <27F36755-DB7A-4BD0-9CB1-E2FF6FC2DEB9@gmail.com>
From: Daan Hoogland <daan.hoogland@gmail.com>
Date: Fri, 30 Oct 2015 12:34:15 +0100
Message-ID: 
 <CAGQtxvYojOrW_ZnqWwPR_a2igBwhRzcTuZCq-8RveWWHkzGBPw@mail.gmail.com>
Subject: Re: Git with Eclipse
To: dev <dev@cloudstack.apache.org>
Cc: Ron Wheeler <rwheeler@artifact-software.com>
Content-Type: multipart/alternative; boundary=001a114250bed65112052350cfc2

--001a114250bed65112052350cfc2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Ron, in eclipse i avoid doing any work involving multiple remotes. I do
those things from the commandline. Other things work fine and the part with
remotes might work well as well these days. If you use only your fork from
eclipse and fetch and rebase from apache or github  from out side eclipse
you won't have much issues either but integrating is really for the Devine.
I won't go as far as to say it doesn't work but I recognise your pain and
there is to much useful stuff to be done to dive into this IMHO.

What Sebastien describes is good with one addition: keep your fork up to
date by pushing a fetch from apache back to yours from time to time. What I
do is I fetch master from github/apache, branch, checkout my branch, edit
and commit on my branch and then push my branch to my fork (not using
master there  at all. The rest I do on the github ui as Sebastien
describes.


On Fri, Oct 30, 2015 at 10:58 AM, Sebastien Goasguen <runseb@gmail.com>
wrote:

> Ron,
>
> I don=E2=80=99t know how to use Github with eclipse, I use the command li=
ne for
> everything.
>
> But the documentation should be good:
>
> https://github.com/apache/cloudstack-docs-admin#contributing-to-the-docum=
entation
>
> Basically you need an account on GitHub.
> You fork https://github.com/apache/cloudstack-docs-admin (or the other
> docs repo).
> You will then have a fork at https://github.com/
> <YOUR_ACCOUNT>/cloudstack-docs-admin
>
> Clone your own fork:
>
> $ git clone https://github.com/<YOUR_ACCOUNT>/cloudstack-docs-admin
>
> Make your commits via eclipse and push to your own fork.
>
> Then on the GitHub UI, create a pull request to the upstream repo:
> https://github.com/apache/cloudstack-docs-admin
>
> -sebastien
>
> > On Oct 29, 2015, at 9:58 PM, Ron Wheeler <rwheeler@artifact-software.co=
m>
> wrote:
> >
> > Trying to help out with the docs without doing too much damage.
> > I am new to git.
> >
> > I am using Eclipse with the egit/mylyn plug-in and I have managed to ge=
t
> the source for the docs-admin downloaded.
> >
> > The "Configure Fetch" has a Source Ref of "refs/heads/*" and a
> Desctination Ref  of "refs/remotes/origin/*"
> > I think that I have the right sources. They seem to match the published
> docs.
> >
> > I have made my changes and think that I need to create a pull request t=
o
> get one of the Cloudstack gods to decide if my attempts are worthy.
> >
> > I have created the pull request in Eclipse but when I try to submit it =
I
> get an error box titled "Submit failed" popping up with the rather crypti=
c
> "Unexpected error: Invalid request. "base", "head" weren't supplied".
> > I think that I have to configure the "Remotes/origin/
> https://gethub.com/apache/cloudstack-doc-admin.git" entry  using
> "Configure Push" menu.
> >
> > It has a section called "Ref mappings" that I gather is how git figures
> out how I want my changes mapped back into the remote repos.
> >
> > Am I looking in the right places?
> > If so, what are the right "Source Ref" and "Destination Ref" entries to
> get a pull request that will please the gods (both local and remote).
> >
> > It looks like editing and creating pull requests gets easy once this is
> working.
> >
> > Still have to work on getting the document production working so I can
> actually see the fruits of my labour.
> >
> > Thanks
> >
> > Ron
> >
> >
> > *
> > *
> >
> > --
> > Ron Wheeler
> > President
> > Artifact Software Inc
> > email: rwheeler@artifact-software.com
> > skype: ronaldmwheeler
> > phone: 866-970-2435, ext 102
> >
>
>


--=20
Daan

--001a114250bed65112052350cfc2--