Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] Trouble adding a new ptp project to the git repo (Naming copies of repos)

Do you have different copies of the repos for the different branches? I had to do that in order to have separate workspaces not pointing at the same copy of my repo and switching one would switch the other.
e.g. my eclipse 3.7 install uses a ptp50 workspace which uses a git repo on the ptp50 branch
e.g. my eclipse 4.2 install uses a ptp 60 workspace which uses a git repo on the master (ptp60) branch

Am I confusing things?  If not I would really like a suggested convention for what to call things
The term 'master' is used to describe both the aggregated (ptp+photran) build and the latest branch of the repo - that keeps confusing me i think

Is this reasonable?

1. Set of repos where 'master' is the (default) branch used
org.eclipse.photran.git
org.eclipse.ptp.git
org.eclipse.ptp.master.git ('master' refers to aggregated build)*

2. Set of repos where'ptp_5_0' is the (default) branch used
org.eclipse.photran.git-ptp50
org.eclipse.ptp.git-ptp50
org.eclipse.ptp.master.git-ptp50  ('master' refers to aggregated build)*

* do these need to be kept in separate workspaces (per Roland's original answer to my problem) and are only needed for updating the build (e.g. adding new features/plugins)?
   Perhaps just one (smallish) workspace for only  master-aggregated-build work, in which case a single switchable repo might make sense


...Beth

Beth Tibbitts
Eclipse Parallel Tools Platform  http://eclipse.org/ptp
IBM STG - High Performance Computing Tools
Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511

Inactive hide details for Greg Watson ---01/04/2012 10:53:35 AM---I'd use something like: org.eclipse.photran.gitGreg Watson ---01/04/2012 10:53:35 AM---I'd use something like: org.eclipse.photran.git


    From:

Greg Watson <g.watson@xxxxxxxxxxxx>

    To:

Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>,

    Date:

01/04/2012 10:53 AM

    Subject:

Re: [ptp-dev] Trouble adding a new ptp project to the git repo

    Sent by:

ptp-dev-bounces@xxxxxxxxxxx



I'd use something like:

org.eclipse.photran.git
org.eclipse.ptp.git
org.eclipse.ptp.master.git

That way there's no conflict with plugins in your workspace.

Greg

On Jan 3, 2012, at 3:40 PM, Beth Tibbitts wrote:

    Speaking of which, Greg, can you describe a suggested setup for this mess, i mean, sets of source code?
    With a suggestion of what to name our private copies of these repos.
    I started out naming my master 'branch' repo ptp-master which then confused me with the master build which is a the aggregated (ptp+photran) build.
    If we have a convention perhaps it would help my sanity.


    ...Beth

    Beth Tibbitts
    Eclipse Parallel Tools Platform      http://eclipse.org/ptp
    IBM STG - High Performance Computing Tools
    Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511

    <graycol.gif>    "Schaefer, Doug" ---01/03/2012 03:28:52 PM---Yes, it's an annoying limitation. :D
    <ecblank.gif>
      From:
    		<ecblank.gif>
    "Schaefer, Doug" <    Doug.Schaefer@xxxxxxxxxxxxx>
    <ecblank.gif>
      To:
    		<ecblank.gif>
    Parallel Tools Platform general developers <    ptp-dev@xxxxxxxxxxx>,
    <ecblank.gif>
      Date:
    		<ecblank.gif>
    01/03/2012 03:28 PM
    <ecblank.gif>
      Subject:
    		<ecblank.gif>
    Re: [ptp-dev] Trouble adding a new ptp project to the git repo
    <ecblank.gif>
      Sent by:
    		<ecblank.gif>
    ptp-dev-bounces@xxxxxxxxxxx



    Yes, it’s an annoying limitation.

    :D

    From:     ptp-dev-bounces@xxxxxxxxxxx [mailto:ptp-dev-bounces@xxxxxxxxxxx] On Behalf Of Greg Watson
    Sent:     Tuesday, January 03, 2012 2:55 PM
    To:     Parallel Tools Platform general developers
    Subject:     Re: [ptp-dev] Trouble adding a new ptp project to the git repo

    The Hudson/Git plugin does not work correctly when checking out two separate repos for a build, so I had to separate the Photran and PTP builds. There was a further problem that required separating the aggregation out into it's own build also, which requires a separate repo for the same reason. Incidentally, this is how CDT does it's builds.

    Greg

    On Dec 21, 2011, at 8:46 AM, Beth Tibbitts wrote:

    >Why do we need the extra ptp.master repository?
    Greg knows the details but it had to do with the build with tycho/maven/hudson ... since we have two repos (ptp,photran) there need to be two builds, then the aggregated (ptp.master) build is separate.

    ...Beth

    Beth Tibbitts
    Eclipse Parallel Tools Platform      http://eclipse.org/ptp
    IBM STG - High Performance Computing Tools
    Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511

    <graycol.gif>    Roland Schulz ---12/20/2011 11:03:23 PM---On Tue, Dec 20, 2011 at 10:57 PM, Beth Tibbitts <tibbitts@xxxxxxxxxx> wrote: > 


<ecblank.gif> 
    From:
<ecblank.gif>
Roland Schulz <roland@xxxxxxx>
<ecblank.gif> 
    To:
<ecblank.gif>
Parallel Tools Platform general developers <ptp-dev@xxxxxxxxxxx>,
<ecblank.gif> 
    Date:
<ecblank.gif>
12/20/2011 11:03 PM
<ecblank.gif> 
    Subject:
<ecblank.gif>
Re: [ptp-dev] Trouble adding a new ptp project to the git repo
<ecblank.gif> 
    Sent by:
<ecblank.gif>
ptp-dev-bounces@xxxxxxxxxxx




    On Tue, Dec 20, 2011 at 10:57 PM, Beth Tibbitts <    tibbitts@xxxxxxxxxx> wrote:
    >
    > I think you may be right... I may have gotten them confused before.  When trying to get some build changes....
    >
    >
    >
    > >Maybe I misunderstood what org.eclipse.ptp-master is. I was assuming that you use that for     ssh://git.eclipse.org/gitroot/ptp/org.eclipse.ptp.git master branch.
    > Yes that's what it is.
    > I named it that before Greg made the ptp-master-nightly etc builds so 'master' is used to designate the main branch of the repo, as well as the aggregated build (ptp+photran)

    Why do we need the extra ptp.master repository? Wouldn't it be easier
    to just put these few files in either the main ptp or photran
    repository? Might cause less confusion.

    Roland

    >
    >
    > From:
    >
    >
    > Roland Schulz <    roland@xxxxxxx>
    >
    > To:
    >
    >
    > Parallel Tools Platform general developers <    ptp-dev@xxxxxxxxxxx>,
    >
    > Date:
    >
    >
    > 12/20/2011 10:49 PM
    >
    > Subject:
    >
    >
    > Re: [ptp-dev] Trouble adding a new ptp project to the git repo
    >
    > Sent by:
    >
    >
    >     ptp-dev-bounces@xxxxxxxxxxx
    >
    > ________________________________
    >
    >
    >
    >
    >
    > On Tue, Dec 20, 2011 at 10:34 PM, Beth Tibbitts <    tibbitts@xxxxxxxxxx> wrote:
    >
    > >Do you have a .project file in the "/Users/beth/git/org.eclipse.ptp-master" folder?
    > Yes I do, it's from the root project to get the pom.xml file for the master build...
    > Maybe I have to delete it in order to make git create those projects for me, then check it out again... argh.  I think it's going to confuse git.  Me too. :)
    > Will try tomorrow or later.
    >
    >
    > Maybe I misunderstood what org.eclipse.ptp-master is. I was assuming that you use that for     ssh://git.eclipse.org/gitroot/ptp/org.eclipse.ptp.git master branch.
    > Are you or is this the     ssh://git.eclipse.org/gitroot/ptp/org.eclipse.ptp.master.git repository?
    >
    > If it is the master branch of the main repository than I don't think that should have a .project file.
    > If it is the ptp.master repository than I think you selected the wrong repository. Because you probably wanted to add it to the main repository not the ptp.master repository.
    >
    > Roland
    >
    >
    > Thanks.
    >
    >
    > ...Beth
    >
    > Beth Tibbitts
    > Eclipse Parallel Tools Platform      http://eclipse.org/ptp
    > IBM STG - High Performance Computing Tools
    > Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511
    >
    > Roland Schulz ---12/20/2011 07:17:07 PM---Hi, for me this works.
    >
    > From:
    >
    >
    > Roland Schulz <    roland@xxxxxxx>
    >
    > To:
    >
    >
    > Parallel Tools Platform general developers <    ptp-dev@xxxxxxxxxxx>,
    >
    > Date:
    >
    >
    > 12/20/2011 07:17 PM
    >
    > Subject:
    >
    >
    > Re: [ptp-dev] Trouble adding a new ptp project to the git repo
    >
    > Sent by:
    >
    >
    >     ptp-dev-bounces@xxxxxxxxxxx
    > ________________________________
    >
    >
    >
    >
    > Hi,
    >
    > for me this works.
    >
    > Did you check that these target locations don't already exist? Maybe you tried it before?
    > Do you have a .project file in the "/Users/beth/git/org.eclipse.ptp-master" folder? If so I think you should delete that because it shouldn't be there.
    >
    > Roland
    >
    > On Mon, Dec 19, 2011 at 4:51 PM, Beth Tibbitts <    tibbitts@xxxxxxxxxx> wrote:
    >
    > OK this is my first experience adding new projects to git.
    > When I select the two new projects and do Team>Share Project... I select my git repo (same one the rest of this ws uses)
    > but it says "Configure Git Repository ...  Can not move project org.eclipse.ptp.pldt.openacc to target location /Users/beth/git/org.eclipse.ptp-master/org.eclipse.ptp.pldt.openacc, as this location overlaps with location /Users/beth/git/org.eclipse.ptp-master, which contains a .project file
    >
    > Here is the screenshot of the error, if it helps
    >
    > I selected browse for "Path with repository" and selected the location where the rest of pldt sits.  This didn't change the error.
    >
    >
    >
    > ...Beth
    >
    > Beth Tibbitts
    > Eclipse Parallel Tools Platform      http://eclipse.org/ptp
    > IBM STG - High Performance Computing Tools
    > Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511
    >
    >
    >
    >
    >
    > --
    > ORNL/UT Center for Molecular Biophysics     cmb.ornl.gov
    >
    > 865-241-1537, ORNL PO BOX 2008 MS6309_______________________________________________
    > ptp-dev mailing list
    >     ptp-dev@xxxxxxxxxxx
    >     https://dev.eclipse.org/mailman/listinfo/ptp-dev
    >
    >
    >
    >
    >
    > --
    > ORNL/UT Center for Molecular Biophysics     cmb.ornl.gov
    > 865-241-1537, ORNL PO BOX 2008 MS6309_______________________________________________
    > ptp-dev mailing list
    >     ptp-dev@xxxxxxxxxxx
    >     https://dev.eclipse.org/mailman/listinfo/ptp-dev




    --
    ORNL/UT Center for Molecular Biophysics     cmb.ornl.gov
    865-241-1537, ORNL PO BOX 2008 MS6309
    _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev


    _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev
    _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev


    _______________________________________________
    ptp-dev mailing list
    ptp-dev@xxxxxxxxxxx
    https://dev.eclipse.org/mailman/listinfo/ptp-dev
_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev


GIF image

GIF image

Back to the top