does dmca push us further toward distributed rev control?
Post MTG Forge Related Programming Questions Here
Moderators: timmermac, Blacksmith, KrazyTheFox, Agetian, friarsol, CCGHQ Admins
Re: does dmca push us further toward distributed rev control
by Chris H. » 22 Jul 2011, 14:13
`Braids wrote:yes, that's where i got started, too. if anyone finds any errors in the pre-alpha Getting Started Guide https://www.gitorious.org/cardforge/pages/Getting_Started_Guide regarding key generation, please edit it or let me know! thanks.
I will try this out today.
-
Chris H. - Forge Moderator
- Posts: 6320
- Joined: 04 Nov 2008, 12:11
- Location: Mac OS X Yosemite
- Has thanked: 644 times
- Been thanked: 643 times
Re: Document is now in alpha stage
by Chris H. » 22 Jul 2011, 14:52
`Braids wrote:the new getting started guide https://www.gitorious.org/cardforge/pages/Getting_Started_Guide is now ready for alpha test. using it, i was able to push a change to the repo on gitorious.
because gitorious's wiki doesn't handle concurrent editing very well, please do not edit the document. instead, please post your comments here.
I was able to follow the Create and Register Your Public-Private Key Pair instructions and they were helpful. A few additions follow.
5. Please note that you should go to your dashboard and click on the Edit Details button. Enter a full name in the text box which is located above the E-mail text box. The name and e-mail address that you add to the Comment field should match the contents of these two text boxes.
8. You will notice that the key is being saved to your ~/Users/youraccount/.ssh/ folder.
17. Click the Save button in your web browser to save your public SSH key. Go to your dashboard on Gitorious. Click on Manage SSH Keys. You should see Your SSH Keys with a green colored check mark under the Ready? column.
-
Chris H. - Forge Moderator
- Posts: 6320
- Joined: 04 Nov 2008, 12:11
- Location: Mac OS X Yosemite
- Has thanked: 644 times
- Been thanked: 643 times
Re: does dmca push us further toward distributed rev control
by jeffwadsworth » 22 Jul 2011, 14:54
@Braids.
Clone the Git Repository
In the very helpful guide, you may want to include something about using the "passphrase" as the password if prompted after step 12 or so.
Clone the Git Repository
In the very helpful guide, you may want to include something about using the "passphrase" as the password if prompted after step 12 or so.
- jeffwadsworth
- Super Tester Elite
- Posts: 1172
- Joined: 20 Oct 2010, 04:47
- Location: USA
- Has thanked: 287 times
- Been thanked: 70 times
Re: does dmca push us further toward distributed rev control
by Rob Cashwalker » 22 Jul 2011, 15:45
I'm having a hard time getting my local clone to update to the latest repository.
I have some pending changes to the Quest mode to support the standard cardpool stuff. It's pretty much done, but before I commit I always do an update, to make sure nothing new would interfere, and if it did, I would get an obvious indication of where the conflict was.
I did a Pull operation, from the main repository and it notified me that there were conflicts. I went into synchronize mode, and started checking each change listed to use the Merge function... Now my local repository shows lots of files as being changed, even though my changes were only in a few specific files.
I might just as well start a fresh clone
I have some pending changes to the Quest mode to support the standard cardpool stuff. It's pretty much done, but before I commit I always do an update, to make sure nothing new would interfere, and if it did, I would get an obvious indication of where the conflict was.
I did a Pull operation, from the main repository and it notified me that there were conflicts. I went into synchronize mode, and started checking each change listed to use the Merge function... Now my local repository shows lots of files as being changed, even though my changes were only in a few specific files.
I might just as well start a fresh clone
The Force will be with you, Always.
-
Rob Cashwalker - Programmer
- Posts: 2167
- Joined: 09 Sep 2008, 15:09
- Location: New York
- Has thanked: 5 times
- Been thanked: 40 times
Re: does dmca push us further toward distributed rev control
by friarsol » 22 Jul 2011, 15:54
I think what you want to do is Pull from the Master to your clone. This should update your local files, and merge any changes (and tell you to manually merge any conflicts it can't resolve). Then you want to Push back to the Master. I'm not sure if Sync is actually doing the same thing it does in SVN, which would cause you to have "changed" files that don't actually have any changes in them.Rob Cashwalker wrote:I'm having a hard time getting my local clone to update to the latest repository.
I have some pending changes to the Quest mode to support the standard cardpool stuff. It's pretty much done, but before I commit I always do an update, to make sure nothing new would interfere, and if it did, I would get an obvious indication of where the conflict was.
I did a Pull operation, from the main repository and it notified me that there were conflicts. I went into synchronize mode, and started checking each change listed to use the Merge function... Now my local repository shows lots of files as being changed, even though my changes were only in a few specific files.
I might just as well start a fresh clone
- friarsol
- Global Moderator
- Posts: 7593
- Joined: 15 May 2010, 04:20
- Has thanked: 243 times
- Been thanked: 965 times
Re: does dmca push us further toward distributed rev control
by Rob Cashwalker » 22 Jul 2011, 16:30
I gotta say that SVN was a whole lot simpler....
The Force will be with you, Always.
-
Rob Cashwalker - Programmer
- Posts: 2167
- Joined: 09 Sep 2008, 15:09
- Location: New York
- Has thanked: 5 times
- Been thanked: 40 times
Re: does dmca push us further toward distributed rev control
by jeffwadsworth » 22 Jul 2011, 16:51
Yeah, there really is no comparison. But, at least we have a safehouse.Rob Cashwalker wrote:I gotta say that SVN was a whole lot simpler....
- jeffwadsworth
- Super Tester Elite
- Posts: 1172
- Joined: 20 Oct 2010, 04:47
- Location: USA
- Has thanked: 287 times
- Been thanked: 70 times
Re: does dmca push us further toward distributed rev control
by jendave » 22 Jul 2011, 17:24
Please install the Maven plugin for Eclipse. It is available from the usual menu item in Eclipse under "Maven Integration for Eclipse". I have updated the pom.xml and added back the .classpath and .project files. I was able to build and run Forge fine from within Eclipse without using any Maven speific commands i.e. the Maven integration is transparent. you will notice the dependencies look different because that is what we actually use for the release builds. If there are any issues, let me know.
Re: does dmca push us further toward distributed rev control
by Chris H. » 22 Jul 2011, 17:39
Thank you Dave.
I am not fully up to speed yet, working on the getting started guide with Braids and taking this one step at a time.
I am not fully up to speed yet, working on the getting started guide with Braids and taking this one step at a time.
-
Chris H. - Forge Moderator
- Posts: 6320
- Joined: 04 Nov 2008, 12:11
- Location: Mac OS X Yosemite
- Has thanked: 644 times
- Been thanked: 643 times
Re: does dmca push us further toward distributed rev control
by jendave » 22 Jul 2011, 17:46
On another rev control issue, where should we put the artifacts of the release process -
While Rob will graciously host the releases, I want to be conscience of the bandwidth that the Site and dailybuilds may take. Any ideas? I researched uploads into Git, but it does not look as robust as the SVN support was.
- Releases - go to ftp.cardforge.org per Rob
Site Reports - used to be in google SVN
Daily Builds - this would be great
While Rob will graciously host the releases, I want to be conscience of the bandwidth that the Site and dailybuilds may take. Any ideas? I researched uploads into Git, but it does not look as robust as the SVN support was.
Re: does dmca push us further toward distributed rev control
by Chris H. » 22 Jul 2011, 18:05
-
Chris H. - Forge Moderator
- Posts: 6320
- Joined: 04 Nov 2008, 12:11
- Location: Mac OS X Yosemite
- Has thanked: 644 times
- Been thanked: 643 times
Re: does dmca push us further toward distributed rev control
by Chris H. » 22 Jul 2011, 18:24
Import the Cloned Repository
1. I have one cardforge repository named cardforge without the "-master". I assume that this is the master as there is only one repository listed.
6. Clicking finish results in a project named ForgeGIT [cardforge master] appearing in Eclipse's Package Explorer view. This will take some time, so be patient.
EDIT:
About ten minutes have gone by and Eclipse is still Updating indexes. Not sure if something is wrong or not. I can give it more time.
I clicked on Manage SSH Keys and there is a green colored check-mark in the Ready? column.
It finally finished and everything looks OK at this time. The Import the Cloned Repository took longer that expected.
1. I have one cardforge repository named cardforge without the "-master". I assume that this is the master as there is only one repository listed.
6. Clicking finish results in a project named ForgeGIT [cardforge master] appearing in Eclipse's Package Explorer view. This will take some time, so be patient.
EDIT:
About ten minutes have gone by and Eclipse is still Updating indexes. Not sure if something is wrong or not. I can give it more time.
I clicked on Manage SSH Keys and there is a green colored check-mark in the Ready? column.
It finally finished and everything looks OK at this time. The Import the Cloned Repository took longer that expected.
-
Chris H. - Forge Moderator
- Posts: 6320
- Joined: 04 Nov 2008, 12:11
- Location: Mac OS X Yosemite
- Has thanked: 644 times
- Been thanked: 643 times
Re: does dmca push us further toward distributed rev control
by Rob Cashwalker » 22 Jul 2011, 18:56
cardforge.org is now on an unlimited bandwidth server. It's a little sluggish sometimes, but that's the price of dirt-cheap unlimited hosting...
you can put the site reports onto cardforge.org as well
you can put the site reports onto cardforge.org as well
The Force will be with you, Always.
-
Rob Cashwalker - Programmer
- Posts: 2167
- Joined: 09 Sep 2008, 15:09
- Location: New York
- Has thanked: 5 times
- Been thanked: 40 times
Re: does dmca push us further toward distributed rev control
by jeffwadsworth » 22 Jul 2011, 19:07
http://eclipse.org/m2e/jendave wrote:Please install the Maven plugin for Eclipse. It is available from the usual menu item in Eclipse under "Maven Integration for Eclipse". I have updated the pom.xml and added back the .classpath and .project files. I was able to build and run Forge fine from within Eclipse without using any Maven speific commands i.e. the Maven integration is transparent. you will notice the dependencies look different because that is what we actually use for the release builds. If there are any issues, let me know.
I haven't run into so many dead links in a long while...
This may be better:
http://marketplace.eclipse.org/content/ ... on-eclipse
- jeffwadsworth
- Super Tester Elite
- Posts: 1172
- Joined: 20 Oct 2010, 04:47
- Location: USA
- Has thanked: 287 times
- Been thanked: 70 times
Re: does dmca push us further toward distributed rev control
by Chris H. » 22 Jul 2011, 19:25
`jendave wrote:Please install the Maven plugin for Eclipse. It is available from the usual menu item in Eclipse under "Maven Integration for Eclipse". I have updated the pom.xml and added back the .classpath and .project files. I was able to build and run Forge fine from within Eclipse without using any Maven speific commands i.e. the Maven integration is transparent. you will notice the dependencies look different because that is what we actually use for the release builds. If there are any issues, let me know.
Were you referring to this:
`
-
Chris H. - Forge Moderator
- Posts: 6320
- Joined: 04 Nov 2008, 12:11
- Location: Mac OS X Yosemite
- Has thanked: 644 times
- Been thanked: 643 times
Who is online
Users browsing this forum: No registered users and 59 guests