You can subscribe to this list here.
2005 |
Jan
|
Feb
(25) |
Mar
(84) |
Apr
(76) |
May
(25) |
Jun
(1) |
Jul
(28) |
Aug
(23) |
Sep
(50) |
Oct
(46) |
Nov
(65) |
Dec
(76) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(60) |
Feb
(33) |
Mar
(4) |
Apr
(17) |
May
(16) |
Jun
(18) |
Jul
(131) |
Aug
(11) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(5) |
2007 |
Jan
(71) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(19) |
Jul
(40) |
Aug
(38) |
Sep
(7) |
Oct
(58) |
Nov
|
Dec
(10) |
2008 |
Jan
(17) |
Feb
(27) |
Mar
(12) |
Apr
(1) |
May
(50) |
Jun
(10) |
Jul
|
Aug
(15) |
Sep
(24) |
Oct
(64) |
Nov
(115) |
Dec
(47) |
2009 |
Jan
(30) |
Feb
(1) |
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
(4) |
Nov
(132) |
Dec
(93) |
2010 |
Jan
(266) |
Feb
(120) |
Mar
(168) |
Apr
(127) |
May
(83) |
Jun
(93) |
Jul
(77) |
Aug
(77) |
Sep
(86) |
Oct
(30) |
Nov
(4) |
Dec
(22) |
2011 |
Jan
(48) |
Feb
(81) |
Mar
(198) |
Apr
(174) |
May
(72) |
Jun
(101) |
Jul
(236) |
Aug
(144) |
Sep
(54) |
Oct
(132) |
Nov
(94) |
Dec
(111) |
2012 |
Jan
(135) |
Feb
(166) |
Mar
(86) |
Apr
(85) |
May
(137) |
Jun
(83) |
Jul
(54) |
Aug
(29) |
Sep
(49) |
Oct
(37) |
Nov
(8) |
Dec
(6) |
2013 |
Jan
(2) |
Feb
|
Mar
(1) |
Apr
(14) |
May
(5) |
Jun
(15) |
Jul
|
Aug
(38) |
Sep
(44) |
Oct
(45) |
Nov
(40) |
Dec
(23) |
2014 |
Jan
(22) |
Feb
(63) |
Mar
(43) |
Apr
(60) |
May
(10) |
Jun
(5) |
Jul
(13) |
Aug
(57) |
Sep
(36) |
Oct
(2) |
Nov
(30) |
Dec
(27) |
2015 |
Jan
(5) |
Feb
(2) |
Mar
(14) |
Apr
(3) |
May
|
Jun
(3) |
Jul
(10) |
Aug
(63) |
Sep
(31) |
Oct
(26) |
Nov
(11) |
Dec
(6) |
2016 |
Jan
|
Feb
(11) |
Mar
|
Apr
|
May
(1) |
Jun
(16) |
Jul
|
Aug
(4) |
Sep
|
Oct
(1) |
Nov
(4) |
Dec
(1) |
2017 |
Jan
(2) |
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
(20) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
(10) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(3) |
Apr
(9) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
(4) |
2021 |
Jan
(5) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Erik V. <eri...@xs...> - 2011-07-20 21:47:11
|
My HEAD is at dab610 (parent fd4a38) and includes my commit, but not Stefan's. I'll try again tomorrow. Erik. > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Wednesday, July 20, 2011 11:30 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is now > available.] > > One thing you can try is clone a new repository. Then, export your commits > as a diff that can be applied to the newly cloned tree. Once done, you can try > pushing from a fresh tree. > > While Git tries to allow your to be ambigious and tries to do the right thing, > you can also be explicit with your pushes: > > $ git push origin master:refs/heads/master > > This says "Push local master branch to refs/heads/master on origin." > > According to the GitWeb, HEAD in the repo should be at d123b894c. > > ---Brett. > > > On Wed, Jul 20, 2011 at 2:27 PM, Erik Vos <eri...@xs...> wrote: > > Something has worked: Team|Merge on FETCH_HEAD has updated my > working > > copies with Stefan's changes. > > All these changes have disappeared from the Synchronize view, except > > RevenueCalculatorMultiHex.java, which now shows a merge conflict, even > > though the local and remote sources are identical. "Mark as merged" > > does nothing. > > > > And I still can't push, with the same error message. > > > > Erik. > > > >> -----Original Message----- > >> From: Erik Vos [mailto:eri...@xs...] > >> Sent: Wednesday, July 20, 2011 11:11 PM > >> To: 'Development list for Rails: an 18xx game' > >> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > >> is now available.] > >> > >> Hmm, now *I* seem to be royally stuck. > >> > >> I have prepared and committed some changes (in master) and tried to > >> push this commit, but it keeps being rejected with a message > >> "non-fast > > forward". > >> Google tells me that this means that there is stuff waiting to be > >> pulled > > first, > >> so I tried that (not sure if I started with fetch or with pull, tried > > both), but I > >> keep getting "No ref to fetch from origin - everything up to date". > >> Merge attempts fail as well. My working copy of 1826/Game.xml (just > >> one file changed by Stefan) is not updated. > >> > >> I suppose that Stefan's branching is somehow related to this problem. > >> Why has this H_train branch been pushed at all? For now I'm only > >> interested > > in > >> what's in the master branch. > >> I would think we can better refrain from branching until the normal > > (master) > >> pushes and pulls have proved to work at all sides. > >> > >> I'll keep trying, and perhaps I'll have to try to use git on the > >> command > > line to > >> get this fixed. > >> > >> Anyhow, it's clear that Git is boggling my mind... Perhaps a fresh > >> look tomorrow will help. But PLEASE - keep it simple initially! > >> > >> Erik. > >> > >> > -----Original Message----- > >> > From: Stefan Frey [mailto:ste...@we...] > >> > Sent: Wednesday, July 20, 2011 5:03 PM > >> > To: Development list for Rails: an 18xx game > >> > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > >> > is now available.] > >> > > >> > Brett: > >> > sorry I was using the wrong wording below (still kept somehow in my > >> > subversion-world, where a branch is a copy of the trunk). > >> > > >> > I did not clone the local repo, instead I created a branch inside > >> > the same repo. So my actual workflow was the one you suggested > below. > >> > > >> > So I have two branches shown in the git explorer of egit: master > >> > and > >> h_train. > >> > > >> > Anyhow I tested things again in the last half hour and it did not > >> > work > >> first, but > >> > now it worked out of the blue. > >> > > >> > Have you changed anything on the settings or did I torture egit for > >> > so > >> long, > >> > that it had pity with me. > >> > > >> > Stefan > >> > > >> > > >> > > >> > > >> > On Wednesday, July 20, 2011 04:45:02 pm brett lentz wrote: > >> > > Comments inline... > >> > > > >> > > On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> > >> > wrote: > >> > > > Actually I had to use the push uri: > >> > > > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails > >> > > > > >> > > > Using the git protocol was not possible, as egit complained > >> > > > that it does not support a username. > >> > > > >> > > Correct. To be able to push changes, your remote uri needs to be > >> > > the ssh uri. > >> > > > >> > > You can modify this setting on the fly, and don't need to > >> > > re-clone the repository. The "git config" CLI commands can update > >> > > any repository setting. > >> > > > >> > > > I prefer not to use the synchronize perspective with git, as I > >> > > > wonder what it actually shows, as there are now two states of > >> > > > changes (changes not committed, changes committed but not > >> > > > pushed > >> > yet). > >> > > > >> > > I'm not yet familiar with EGit, so most of the following > >> > > information will be based on my knowledge of the CLI tools. > >> > > > >> > > > So my intended workflow to implement a new feature was: > >> > > > A) Create a branch for that feature locally by cloning my local > >> > > > master which is itself a clone of the remote master. > >> > > > B) Commit the changes in the local branch. > >> > > > C) Push/merge those changes into my local master. > >> > > > D) Push the changes from the local master into the remote master. > >> > > > >> > > Creating two local repositories is unnecessary and might be > >> > > adding extra complications to your workflow. > >> > > > >> > > Let's see if we can get the simple use case working, then you can > >> > > decide if you need more. > >> > > > >> > > Try doing this: > >> > > > >> > > 1. Create a topic branch. > >> > > 2. Work as needed in the topic branch, making local commits when > >> > > it makes sense. 3. When you've got an amount of work that's ready > >> > > to push, update your local master and then merge your topic > >> > > branch to your > >> > local master. > >> > > 4. Push your changes to the remote repository. > >> > > > >> > > Let's even save rebasing for later. > >> > > > >> > > > Unfortunately I was not able to push the changes to the master > >> > > > branch, I got a rejected error message for this (both on dry > >> > > > run and real). But my local master is up-to-date with the repo > master. > >> > > > >> > > If you post the error message, it would help. > >> > > > >> > > The most common reasons for a failed push are: > >> > > > >> > > 1. Authentication and permissions problems (including using the > >> > > wrong remote.origin.url. > >> > > 2. Local branch being out of sync with remote branch. (try a git > >> > > pull, then retry your push.) > >> > > > >> > > Unline SVN, Git won't let you push changes if your local tree is > >> > > out of sync with the remote tree. You need to pull any remote > >> > > changes into your local tree, resolve any merge conflicts (if > >> > > any) locally, then push your changes. > >> > > > >> > > > However I was able to push my branch H_train into the repo and > >> > > > was able to push my committed changes there. > >> > > > > >> > > > My ref spec for the push to the master is: > >> > > > refs/heads/master:refs/heads/master > >> > > > >> > > This looks correct. > >> > > > >> > > It would be more useful to diagnose the issue to do this: > >> > > > >> > > $ git fetch > >> > > $ git status > >> > > $ git branch -vv > >> > > $ git diff origin/master master --stat > >> > > > >> > > The fetch will update your remote refs without changing your > >> > > working copy. Git pull simply is a shortcut to running fetch then > >> > > either merge or rebase (depending on chosen options). > >> > > > >> > > The output of the status, branch, and diff commands will tell you > >> > > how out of sync you are with the remote side, often telling you > >> > > how many commits ahead or behind you are. > >> > > > >> > > > What have I done wrong? > >> > > > Maybe it is better to wait for Brett to help here, I do not > >> > > > want to break anything and he has daily working knowledge with git. > >> > > > > >> > > > Stefan > >> > > > >> > > ---Brett. > >> > > > >> > > > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: > >> > > >> See below for my findings > >> > > >> > >> > > >> > -----Original Message----- > >> > > >> > From: Stefan Frey [mailto:ste...@we...] > >> > > >> > > >> > > >> > Brett or Erik: > >> > > >> > I believe I am doing something wrong or something is not > >> > > >> > setup correctly, > >> > > >> > >> > > >> but > >> > > >> > >> > > >> > I do not get the push working after the commit. > >> > > >> > > >> > > >> > I did setup a complete new workspace for git, cloned > >> > > >> > remote, changed , committed, then pushed to remote. > >> > > >> > All steps worked, except the final push. > >> > > >> > >> > > >> I did the same thing, and it all appears to have worked. I'm > >> > > >> not happy with the way Egit reports a successful push: the > >> > > >> synchronization view is not updated (unlike Subversive, which > >> > > >> cleaned up that view after a commit). Basically I have to > >> > > >> conclude success from the absence of error messages; I would > >> > > >> have preferred > >> > some positive message. > >> > > >> > >> > > >> > The error message I get is that the push is not permitted. > >> > > >> > > >> > > >> > My thoughts are: > >> > > >> > > >> > > >> > I have not setup a specific push-URI, only used the > >> > > >> > sourceforge link > >> > > >> > git://rails.git.sourceforge.net/gitroot/rails/rails > >> > > >> > >> > > >> Same as I did, except that I had inserted my username, as per > >> > > >> the Egit help info > >> (git://ev...@ra.../gitroot/rails/rails). > >> > > >> I wonder: could and should I also insert my password? Now I'm > >> > > >> asked to type my Sourceforge password *every* time I access > >> > > >> remote (Subversive only required it once per Eclipse session). > >> > > >> I could not find a place to configure that either. > >> > > >> > >> > > >> > During the clone the fields for authentication were grayed out. > >> > > >> > >> > > >> Can't remember. > >> > > >> > >> > > >> > During the push I never got asked for my user-account or > >> > > >> > password on sourceforge. > >> > > >> > >> > > >> I think I was asked for my password only, as I had included mu > >> > > >> username in the URL. > >> > > >> > >> > > >> > I was not able to locate anywhere in all those Eclipse > >> > > >> > dialogs where I > >> > > >> > >> > > >> might be > >> > > >> > >> > > >> > able to setup my account. > >> > > >> > >> > > >> The only place I found was in the Push Wizard > >> > > >> (Team|Remote|Push), but I haven't used the Custom part of that > either. > >> > > >> > >> > > >> > Could you please provide help? > >> > > >> > >> > > >> Unfortunately I can't speak the final word on this matter. > >> > > >> Let's together try to find what works best. > >> > > >> > >> > > >> Erik. > >> > > >> > >> > > >> > >> > > >> -------------------------------------------------------------- > >> > > >> --- > >> > > >> -- > >> > > >> ----- > >> > > >> --- --- 10 Tips for Better Web Security Learn 10 ways to > >> > > >> better secure your business today. Topics covered > >> > > >> include: Web security, SSL, hacker attacks & Denial of Service > >> > > >> (DoS), private keys, security Microsoft Exchange, secure > >> > > >> Instant Messaging, and much more. > >> > > >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ > >> > > >> _______________________________________________ > >> > > >> Rails-devel mailing list > >> > > >> Rai...@li... > >> > > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > > > >> > > > --------------------------------------------------------------- > >> > > > --- > >> > > > -- > >> > > > ----- > >> > > > ----- 10 Tips for Better Web Security Learn 10 ways to better > >> > > > secure your business today. Topics covered > >> > > > include: Web security, SSL, hacker attacks & Denial of Service > >> > > > (DoS), private keys, security Microsoft Exchange, secure > >> > > > Instant Messaging, and much more. > >> > > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > >> > > > _______________________________________________ > >> > > > Rails-devel mailing list > >> > > > Rai...@li... > >> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > > >> > > ----------------------------------------------------------------- > >> > > --- > >> > > -- > >> > > ----- > >> > > --- 10 Tips for Better Web Security Learn 10 ways to better > >> > > secure your business today. Topics covered > >> > include: > >> > > Web security, SSL, hacker attacks & Denial of Service (DoS), > >> > > private keys, security Microsoft Exchange, secure Instant > >> > > Messaging, and much > >> > more. > >> > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > >> > > _______________________________________________ > >> > > Rails-devel mailing list > >> > > Rai...@li... > >> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > >> > > >> > > ---------------------------------------------------------------------- > > ------ > >> -- > >> > 10 Tips for Better Web Security > >> > Learn 10 ways to better secure your business today. Topics covered > >> include: > >> > Web security, SSL, hacker attacks & Denial of Service (DoS), > >> > private keys, security Microsoft Exchange, secure Instant > >> > Messaging, and much > >> more. > >> > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > >> > _______________________________________________ > >> > Rails-devel mailing list > >> > Rai...@li... > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> > >> > > ---------------------------------------------------------------------- > > ------ > > -- > >> 10 Tips for Better Web Security > >> Learn 10 ways to better secure your business today. Topics covered > > include: > >> Web security, SSL, hacker attacks & Denial of Service (DoS), private > >> keys, security Microsoft Exchange, secure Instant Messaging, and much > more. > >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > ---------------------------------------------------------------------- > > -------- > > 10 Tips for Better Web Security > > Learn 10 ways to better secure your business today. Topics covered > include: > > Web security, SSL, hacker attacks & Denial of Service (DoS), private > > keys, security Microsoft Exchange, secure Instant Messaging, and much > more. > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-20 21:30:21
|
One thing you can try is clone a new repository. Then, export your commits as a diff that can be applied to the newly cloned tree. Once done, you can try pushing from a fresh tree. While Git tries to allow your to be ambigious and tries to do the right thing, you can also be explicit with your pushes: $ git push origin master:refs/heads/master This says "Push local master branch to refs/heads/master on origin." According to the GitWeb, HEAD in the repo should be at d123b894c. ---Brett. On Wed, Jul 20, 2011 at 2:27 PM, Erik Vos <eri...@xs...> wrote: > Something has worked: Team|Merge on FETCH_HEAD has updated my working copies > with Stefan's changes. > All these changes have disappeared from the Synchronize view, except > RevenueCalculatorMultiHex.java, which now shows a merge conflict, even > though the local and remote sources are identical. "Mark as merged" does > nothing. > > And I still can't push, with the same error message. > > Erik. > >> -----Original Message----- >> From: Erik Vos [mailto:eri...@xs...] >> Sent: Wednesday, July 20, 2011 11:11 PM >> To: 'Development list for Rails: an 18xx game' >> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is now >> available.] >> >> Hmm, now *I* seem to be royally stuck. >> >> I have prepared and committed some changes (in master) and tried to push >> this commit, but it keeps being rejected with a message "non-fast > forward". >> Google tells me that this means that there is stuff waiting to be pulled > first, >> so I tried that (not sure if I started with fetch or with pull, tried > both), but I >> keep getting "No ref to fetch from origin - everything up to date". Merge >> attempts fail as well. My working copy of 1826/Game.xml (just one file >> changed by Stefan) is not updated. >> >> I suppose that Stefan's branching is somehow related to this problem. Why >> has this H_train branch been pushed at all? For now I'm only interested > in >> what's in the master branch. >> I would think we can better refrain from branching until the normal > (master) >> pushes and pulls have proved to work at all sides. >> >> I'll keep trying, and perhaps I'll have to try to use git on the command > line to >> get this fixed. >> >> Anyhow, it's clear that Git is boggling my mind... Perhaps a fresh look >> tomorrow will help. But PLEASE - keep it simple initially! >> >> Erik. >> >> > -----Original Message----- >> > From: Stefan Frey [mailto:ste...@we...] >> > Sent: Wednesday, July 20, 2011 5:03 PM >> > To: Development list for Rails: an 18xx game >> > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is >> > now available.] >> > >> > Brett: >> > sorry I was using the wrong wording below (still kept somehow in my >> > subversion-world, where a branch is a copy of the trunk). >> > >> > I did not clone the local repo, instead I created a branch inside the >> > same repo. So my actual workflow was the one you suggested below. >> > >> > So I have two branches shown in the git explorer of egit: master and >> h_train. >> > >> > Anyhow I tested things again in the last half hour and it did not work >> first, but >> > now it worked out of the blue. >> > >> > Have you changed anything on the settings or did I torture egit for so >> long, >> > that it had pity with me. >> > >> > Stefan >> > >> > >> > >> > >> > On Wednesday, July 20, 2011 04:45:02 pm brett lentz wrote: >> > > Comments inline... >> > > >> > > On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> >> > wrote: >> > > > Actually I had to use the push uri: >> > > > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails >> > > > >> > > > Using the git protocol was not possible, as egit complained that >> > > > it does not support a username. >> > > >> > > Correct. To be able to push changes, your remote uri needs to be the >> > > ssh uri. >> > > >> > > You can modify this setting on the fly, and don't need to re-clone >> > > the repository. The "git config" CLI commands can update any >> > > repository setting. >> > > >> > > > I prefer not to use the synchronize perspective with git, as I >> > > > wonder what it actually shows, as there are now two states of >> > > > changes (changes not committed, changes committed but not pushed >> > yet). >> > > >> > > I'm not yet familiar with EGit, so most of the following information >> > > will be based on my knowledge of the CLI tools. >> > > >> > > > So my intended workflow to implement a new feature was: >> > > > A) Create a branch for that feature locally by cloning my local >> > > > master which is itself a clone of the remote master. >> > > > B) Commit the changes in the local branch. >> > > > C) Push/merge those changes into my local master. >> > > > D) Push the changes from the local master into the remote master. >> > > >> > > Creating two local repositories is unnecessary and might be adding >> > > extra complications to your workflow. >> > > >> > > Let's see if we can get the simple use case working, then you can >> > > decide if you need more. >> > > >> > > Try doing this: >> > > >> > > 1. Create a topic branch. >> > > 2. Work as needed in the topic branch, making local commits when it >> > > makes sense. 3. When you've got an amount of work that's ready to >> > > push, update your local master and then merge your topic branch to >> > > your >> > local master. >> > > 4. Push your changes to the remote repository. >> > > >> > > Let's even save rebasing for later. >> > > >> > > > Unfortunately I was not able to push the changes to the master >> > > > branch, I got a rejected error message for this (both on dry run >> > > > and real). But my local master is up-to-date with the repo master. >> > > >> > > If you post the error message, it would help. >> > > >> > > The most common reasons for a failed push are: >> > > >> > > 1. Authentication and permissions problems (including using the >> > > wrong remote.origin.url. >> > > 2. Local branch being out of sync with remote branch. (try a git >> > > pull, then retry your push.) >> > > >> > > Unline SVN, Git won't let you push changes if your local tree is out >> > > of sync with the remote tree. You need to pull any remote changes >> > > into your local tree, resolve any merge conflicts (if any) locally, >> > > then push your changes. >> > > >> > > > However I was able to push my branch H_train into the repo and was >> > > > able to push my committed changes there. >> > > > >> > > > My ref spec for the push to the master is: >> > > > refs/heads/master:refs/heads/master >> > > >> > > This looks correct. >> > > >> > > It would be more useful to diagnose the issue to do this: >> > > >> > > $ git fetch >> > > $ git status >> > > $ git branch -vv >> > > $ git diff origin/master master --stat >> > > >> > > The fetch will update your remote refs without changing your working >> > > copy. Git pull simply is a shortcut to running fetch then either >> > > merge or rebase (depending on chosen options). >> > > >> > > The output of the status, branch, and diff commands will tell you >> > > how out of sync you are with the remote side, often telling you how >> > > many commits ahead or behind you are. >> > > >> > > > What have I done wrong? >> > > > Maybe it is better to wait for Brett to help here, I do not want >> > > > to break anything and he has daily working knowledge with git. >> > > > >> > > > Stefan >> > > >> > > ---Brett. >> > > >> > > > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: >> > > >> See below for my findings >> > > >> >> > > >> > -----Original Message----- >> > > >> > From: Stefan Frey [mailto:ste...@we...] >> > > >> > >> > > >> > Brett or Erik: >> > > >> > I believe I am doing something wrong or something is not setup >> > > >> > correctly, >> > > >> >> > > >> but >> > > >> >> > > >> > I do not get the push working after the commit. >> > > >> > >> > > >> > I did setup a complete new workspace for git, cloned remote, >> > > >> > changed , committed, then pushed to remote. >> > > >> > All steps worked, except the final push. >> > > >> >> > > >> I did the same thing, and it all appears to have worked. I'm not >> > > >> happy with the way Egit reports a successful push: the >> > > >> synchronization view is not updated (unlike Subversive, which >> > > >> cleaned up that view after a commit). Basically I have to >> > > >> conclude success from the absence of error messages; I would have >> > > >> preferred >> > some positive message. >> > > >> >> > > >> > The error message I get is that the push is not permitted. >> > > >> > >> > > >> > My thoughts are: >> > > >> > >> > > >> > I have not setup a specific push-URI, only used the sourceforge >> > > >> > link git://rails.git.sourceforge.net/gitroot/rails/rails >> > > >> >> > > >> Same as I did, except that I had inserted my username, as per the >> > > >> Egit help info >> (git://ev...@ra.../gitroot/rails/rails). >> > > >> I wonder: could and should I also insert my password? Now I'm >> > > >> asked to type my Sourceforge password *every* time I access >> > > >> remote (Subversive only required it once per Eclipse session). I >> > > >> could not find a place to configure that either. >> > > >> >> > > >> > During the clone the fields for authentication were grayed out. >> > > >> >> > > >> Can't remember. >> > > >> >> > > >> > During the push I never got asked for my user-account or >> > > >> > password on sourceforge. >> > > >> >> > > >> I think I was asked for my password only, as I had included mu >> > > >> username in the URL. >> > > >> >> > > >> > I was not able to locate anywhere in all those Eclipse dialogs >> > > >> > where I >> > > >> >> > > >> might be >> > > >> >> > > >> > able to setup my account. >> > > >> >> > > >> The only place I found was in the Push Wizard (Team|Remote|Push), >> > > >> but I haven't used the Custom part of that either. >> > > >> >> > > >> > Could you please provide help? >> > > >> >> > > >> Unfortunately I can't speak the final word on this matter. Let's >> > > >> together try to find what works best. >> > > >> >> > > >> Erik. >> > > >> >> > > >> >> > > >> ----------------------------------------------------------------- >> > > >> -- >> > > >> ----- >> > > >> --- --- 10 Tips for Better Web Security Learn 10 ways to better >> > > >> secure your business today. Topics covered >> > > >> include: Web security, SSL, hacker attacks & Denial of Service >> > > >> (DoS), private keys, security Microsoft Exchange, secure Instant >> > > >> Messaging, and much more. >> > > >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> > > >> _______________________________________________ >> > > >> Rails-devel mailing list >> > > >> Rai...@li... >> > > >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > > > >> > > > ------------------------------------------------------------------ >> > > > -- >> > > > ----- >> > > > ----- 10 Tips for Better Web Security Learn 10 ways to better >> > > > secure your business today. Topics covered >> > > > include: Web security, SSL, hacker attacks & Denial of Service >> > > > (DoS), private keys, security Microsoft Exchange, secure Instant >> > > > Messaging, and much more. >> > > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> > > > _______________________________________________ >> > > > Rails-devel mailing list >> > > > Rai...@li... >> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > > >> > > -------------------------------------------------------------------- >> > > -- >> > > ----- >> > > --- 10 Tips for Better Web Security >> > > Learn 10 ways to better secure your business today. Topics covered >> > include: >> > > Web security, SSL, hacker attacks & Denial of Service (DoS), private >> > > keys, security Microsoft Exchange, secure Instant Messaging, and >> > > much >> > more. >> > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> > > _______________________________________________ >> > > Rails-devel mailing list >> > > Rai...@li... >> > > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > >> > ---------------------------------------------------------------------------- >> -- >> > 10 Tips for Better Web Security >> > Learn 10 ways to better secure your business today. Topics covered >> include: >> > Web security, SSL, hacker attacks & Denial of Service (DoS), private >> > keys, security Microsoft Exchange, secure Instant Messaging, and much >> more. >> > http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> >> > ---------------------------------------------------------------------------- > -- >> 10 Tips for Better Web Security >> Learn 10 ways to better secure your business today. Topics covered > include: >> Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, >> security Microsoft Exchange, secure Instant Messaging, and much more. >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > ------------------------------------------------------------------------------ > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Erik V. <eri...@xs...> - 2011-07-20 21:27:16
|
Something has worked: Team|Merge on FETCH_HEAD has updated my working copies with Stefan's changes. All these changes have disappeared from the Synchronize view, except RevenueCalculatorMultiHex.java, which now shows a merge conflict, even though the local and remote sources are identical. "Mark as merged" does nothing. And I still can't push, with the same error message. Erik. > -----Original Message----- > From: Erik Vos [mailto:eri...@xs...] > Sent: Wednesday, July 20, 2011 11:11 PM > To: 'Development list for Rails: an 18xx game' > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is now > available.] > > Hmm, now *I* seem to be royally stuck. > > I have prepared and committed some changes (in master) and tried to push > this commit, but it keeps being rejected with a message "non-fast forward". > Google tells me that this means that there is stuff waiting to be pulled first, > so I tried that (not sure if I started with fetch or with pull, tried both), but I > keep getting "No ref to fetch from origin - everything up to date". Merge > attempts fail as well. My working copy of 1826/Game.xml (just one file > changed by Stefan) is not updated. > > I suppose that Stefan's branching is somehow related to this problem. Why > has this H_train branch been pushed at all? For now I'm only interested in > what's in the master branch. > I would think we can better refrain from branching until the normal (master) > pushes and pulls have proved to work at all sides. > > I'll keep trying, and perhaps I'll have to try to use git on the command line to > get this fixed. > > Anyhow, it's clear that Git is boggling my mind... Perhaps a fresh look > tomorrow will help. But PLEASE - keep it simple initially! > > Erik. > > > -----Original Message----- > > From: Stefan Frey [mailto:ste...@we...] > > Sent: Wednesday, July 20, 2011 5:03 PM > > To: Development list for Rails: an 18xx game > > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is > > now available.] > > > > Brett: > > sorry I was using the wrong wording below (still kept somehow in my > > subversion-world, where a branch is a copy of the trunk). > > > > I did not clone the local repo, instead I created a branch inside the > > same repo. So my actual workflow was the one you suggested below. > > > > So I have two branches shown in the git explorer of egit: master and > h_train. > > > > Anyhow I tested things again in the last half hour and it did not work > first, but > > now it worked out of the blue. > > > > Have you changed anything on the settings or did I torture egit for so > long, > > that it had pity with me. > > > > Stefan > > > > > > > > > > On Wednesday, July 20, 2011 04:45:02 pm brett lentz wrote: > > > Comments inline... > > > > > > On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> > > wrote: > > > > Actually I had to use the push uri: > > > > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails > > > > > > > > Using the git protocol was not possible, as egit complained that > > > > it does not support a username. > > > > > > Correct. To be able to push changes, your remote uri needs to be the > > > ssh uri. > > > > > > You can modify this setting on the fly, and don't need to re-clone > > > the repository. The "git config" CLI commands can update any > > > repository setting. > > > > > > > I prefer not to use the synchronize perspective with git, as I > > > > wonder what it actually shows, as there are now two states of > > > > changes (changes not committed, changes committed but not pushed > > yet). > > > > > > I'm not yet familiar with EGit, so most of the following information > > > will be based on my knowledge of the CLI tools. > > > > > > > So my intended workflow to implement a new feature was: > > > > A) Create a branch for that feature locally by cloning my local > > > > master which is itself a clone of the remote master. > > > > B) Commit the changes in the local branch. > > > > C) Push/merge those changes into my local master. > > > > D) Push the changes from the local master into the remote master. > > > > > > Creating two local repositories is unnecessary and might be adding > > > extra complications to your workflow. > > > > > > Let's see if we can get the simple use case working, then you can > > > decide if you need more. > > > > > > Try doing this: > > > > > > 1. Create a topic branch. > > > 2. Work as needed in the topic branch, making local commits when it > > > makes sense. 3. When you've got an amount of work that's ready to > > > push, update your local master and then merge your topic branch to > > > your > > local master. > > > 4. Push your changes to the remote repository. > > > > > > Let's even save rebasing for later. > > > > > > > Unfortunately I was not able to push the changes to the master > > > > branch, I got a rejected error message for this (both on dry run > > > > and real). But my local master is up-to-date with the repo master. > > > > > > If you post the error message, it would help. > > > > > > The most common reasons for a failed push are: > > > > > > 1. Authentication and permissions problems (including using the > > > wrong remote.origin.url. > > > 2. Local branch being out of sync with remote branch. (try a git > > > pull, then retry your push.) > > > > > > Unline SVN, Git won't let you push changes if your local tree is out > > > of sync with the remote tree. You need to pull any remote changes > > > into your local tree, resolve any merge conflicts (if any) locally, > > > then push your changes. > > > > > > > However I was able to push my branch H_train into the repo and was > > > > able to push my committed changes there. > > > > > > > > My ref spec for the push to the master is: > > > > refs/heads/master:refs/heads/master > > > > > > This looks correct. > > > > > > It would be more useful to diagnose the issue to do this: > > > > > > $ git fetch > > > $ git status > > > $ git branch -vv > > > $ git diff origin/master master --stat > > > > > > The fetch will update your remote refs without changing your working > > > copy. Git pull simply is a shortcut to running fetch then either > > > merge or rebase (depending on chosen options). > > > > > > The output of the status, branch, and diff commands will tell you > > > how out of sync you are with the remote side, often telling you how > > > many commits ahead or behind you are. > > > > > > > What have I done wrong? > > > > Maybe it is better to wait for Brett to help here, I do not want > > > > to break anything and he has daily working knowledge with git. > > > > > > > > Stefan > > > > > > ---Brett. > > > > > > > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: > > > >> See below for my findings > > > >> > > > >> > -----Original Message----- > > > >> > From: Stefan Frey [mailto:ste...@we...] > > > >> > > > > >> > Brett or Erik: > > > >> > I believe I am doing something wrong or something is not setup > > > >> > correctly, > > > >> > > > >> but > > > >> > > > >> > I do not get the push working after the commit. > > > >> > > > > >> > I did setup a complete new workspace for git, cloned remote, > > > >> > changed , committed, then pushed to remote. > > > >> > All steps worked, except the final push. > > > >> > > > >> I did the same thing, and it all appears to have worked. I'm not > > > >> happy with the way Egit reports a successful push: the > > > >> synchronization view is not updated (unlike Subversive, which > > > >> cleaned up that view after a commit). Basically I have to > > > >> conclude success from the absence of error messages; I would have > > > >> preferred > > some positive message. > > > >> > > > >> > The error message I get is that the push is not permitted. > > > >> > > > > >> > My thoughts are: > > > >> > > > > >> > I have not setup a specific push-URI, only used the sourceforge > > > >> > link git://rails.git.sourceforge.net/gitroot/rails/rails > > > >> > > > >> Same as I did, except that I had inserted my username, as per the > > > >> Egit help info > (git://ev...@ra.../gitroot/rails/rails). > > > >> I wonder: could and should I also insert my password? Now I'm > > > >> asked to type my Sourceforge password *every* time I access > > > >> remote (Subversive only required it once per Eclipse session). I > > > >> could not find a place to configure that either. > > > >> > > > >> > During the clone the fields for authentication were grayed out. > > > >> > > > >> Can't remember. > > > >> > > > >> > During the push I never got asked for my user-account or > > > >> > password on sourceforge. > > > >> > > > >> I think I was asked for my password only, as I had included mu > > > >> username in the URL. > > > >> > > > >> > I was not able to locate anywhere in all those Eclipse dialogs > > > >> > where I > > > >> > > > >> might be > > > >> > > > >> > able to setup my account. > > > >> > > > >> The only place I found was in the Push Wizard (Team|Remote|Push), > > > >> but I haven't used the Custom part of that either. > > > >> > > > >> > Could you please provide help? > > > >> > > > >> Unfortunately I can't speak the final word on this matter. Let's > > > >> together try to find what works best. > > > >> > > > >> Erik. > > > >> > > > >> > > > >> ----------------------------------------------------------------- > > > >> -- > > > >> ----- > > > >> --- --- 10 Tips for Better Web Security Learn 10 ways to better > > > >> secure your business today. Topics covered > > > >> include: Web security, SSL, hacker attacks & Denial of Service > > > >> (DoS), private keys, security Microsoft Exchange, secure Instant > > > >> Messaging, and much more. > > > >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > > >> _______________________________________________ > > > >> Rails-devel mailing list > > > >> Rai...@li... > > > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > ------------------------------------------------------------------ > > > > -- > > > > ----- > > > > ----- 10 Tips for Better Web Security Learn 10 ways to better > > > > secure your business today. Topics covered > > > > include: Web security, SSL, hacker attacks & Denial of Service > > > > (DoS), private keys, security Microsoft Exchange, secure Instant > > > > Messaging, and much more. > > > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > > > _______________________________________________ > > > > Rails-devel mailing list > > > > Rai...@li... > > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > -------------------------------------------------------------------- > > > -- > > > ----- > > > --- 10 Tips for Better Web Security > > > Learn 10 ways to better secure your business today. Topics covered > > include: > > > Web security, SSL, hacker attacks & Denial of Service (DoS), private > > > keys, security Microsoft Exchange, secure Instant Messaging, and > > > much > > more. > > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ---------------------------------------------------------------------------- > -- > > 10 Tips for Better Web Security > > Learn 10 ways to better secure your business today. Topics covered > include: > > Web security, SSL, hacker attacks & Denial of Service (DoS), private > > keys, security Microsoft Exchange, secure Instant Messaging, and much > more. > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > ---------------------------------------------------------------------------- -- > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: Erik V. <eri...@xs...> - 2011-07-20 21:11:17
|
Hmm, now *I* seem to be royally stuck. I have prepared and committed some changes (in master) and tried to push this commit, but it keeps being rejected with a message "non-fast forward". Google tells me that this means that there is stuff waiting to be pulled first, so I tried that (not sure if I started with fetch or with pull, tried both), but I keep getting "No ref to fetch from origin - everything up to date". Merge attempts fail as well. My working copy of 1826/Game.xml (just one file changed by Stefan) is not updated. I suppose that Stefan's branching is somehow related to this problem. Why has this H_train branch been pushed at all? For now I'm only interested in what's in the master branch. I would think we can better refrain from branching until the normal (master) pushes and pulls have proved to work at all sides. I'll keep trying, and perhaps I'll have to try to use git on the command line to get this fixed. Anyhow, it's clear that Git is boggling my mind... Perhaps a fresh look tomorrow will help. But PLEASE - keep it simple initially! Erik. > -----Original Message----- > From: Stefan Frey [mailto:ste...@we...] > Sent: Wednesday, July 20, 2011 5:03 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is now > available.] > > Brett: > sorry I was using the wrong wording below (still kept somehow in my > subversion-world, where a branch is a copy of the trunk). > > I did not clone the local repo, instead I created a branch inside the same > repo. So my actual workflow was the one you suggested below. > > So I have two branches shown in the git explorer of egit: master and h_train. > > Anyhow I tested things again in the last half hour and it did not work first, but > now it worked out of the blue. > > Have you changed anything on the settings or did I torture egit for so long, > that it had pity with me. > > Stefan > > > > > On Wednesday, July 20, 2011 04:45:02 pm brett lentz wrote: > > Comments inline... > > > > On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> > wrote: > > > Actually I had to use the push uri: > > > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails > > > > > > Using the git protocol was not possible, as egit complained that it > > > does not support a username. > > > > Correct. To be able to push changes, your remote uri needs to be the > > ssh uri. > > > > You can modify this setting on the fly, and don't need to re-clone the > > repository. The "git config" CLI commands can update any repository > > setting. > > > > > I prefer not to use the synchronize perspective with git, as I > > > wonder what it actually shows, as there are now two states of > > > changes (changes not committed, changes committed but not pushed > yet). > > > > I'm not yet familiar with EGit, so most of the following information > > will be based on my knowledge of the CLI tools. > > > > > So my intended workflow to implement a new feature was: > > > A) Create a branch for that feature locally by cloning my local > > > master which is itself a clone of the remote master. > > > B) Commit the changes in the local branch. > > > C) Push/merge those changes into my local master. > > > D) Push the changes from the local master into the remote master. > > > > Creating two local repositories is unnecessary and might be adding > > extra complications to your workflow. > > > > Let's see if we can get the simple use case working, then you can > > decide if you need more. > > > > Try doing this: > > > > 1. Create a topic branch. > > 2. Work as needed in the topic branch, making local commits when it > > makes sense. 3. When you've got an amount of work that's ready to > > push, update your local master and then merge your topic branch to your > local master. > > 4. Push your changes to the remote repository. > > > > Let's even save rebasing for later. > > > > > Unfortunately I was not able to push the changes to the master > > > branch, I got a rejected error message for this (both on dry run and > > > real). But my local master is up-to-date with the repo master. > > > > If you post the error message, it would help. > > > > The most common reasons for a failed push are: > > > > 1. Authentication and permissions problems (including using the wrong > > remote.origin.url. > > 2. Local branch being out of sync with remote branch. (try a git pull, > > then retry your push.) > > > > Unline SVN, Git won't let you push changes if your local tree is out > > of sync with the remote tree. You need to pull any remote changes into > > your local tree, resolve any merge conflicts (if any) locally, then > > push your changes. > > > > > However I was able to push my branch H_train into the repo and was > > > able to push my committed changes there. > > > > > > My ref spec for the push to the master is: > > > refs/heads/master:refs/heads/master > > > > This looks correct. > > > > It would be more useful to diagnose the issue to do this: > > > > $ git fetch > > $ git status > > $ git branch -vv > > $ git diff origin/master master --stat > > > > The fetch will update your remote refs without changing your working > > copy. Git pull simply is a shortcut to running fetch then either merge > > or rebase (depending on chosen options). > > > > The output of the status, branch, and diff commands will tell you how > > out of sync you are with the remote side, often telling you how many > > commits ahead or behind you are. > > > > > What have I done wrong? > > > Maybe it is better to wait for Brett to help here, I do not want to > > > break anything and he has daily working knowledge with git. > > > > > > Stefan > > > > ---Brett. > > > > > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: > > >> See below for my findings > > >> > > >> > -----Original Message----- > > >> > From: Stefan Frey [mailto:ste...@we...] > > >> > > > >> > Brett or Erik: > > >> > I believe I am doing something wrong or something is not setup > > >> > correctly, > > >> > > >> but > > >> > > >> > I do not get the push working after the commit. > > >> > > > >> > I did setup a complete new workspace for git, cloned remote, > > >> > changed , committed, then pushed to remote. > > >> > All steps worked, except the final push. > > >> > > >> I did the same thing, and it all appears to have worked. I'm not > > >> happy with the way Egit reports a successful push: the > > >> synchronization view is not updated (unlike Subversive, which > > >> cleaned up that view after a commit). Basically I have to conclude > > >> success from the absence of error messages; I would have preferred > some positive message. > > >> > > >> > The error message I get is that the push is not permitted. > > >> > > > >> > My thoughts are: > > >> > > > >> > I have not setup a specific push-URI, only used the sourceforge > > >> > link git://rails.git.sourceforge.net/gitroot/rails/rails > > >> > > >> Same as I did, except that I had inserted my username, as per the > > >> Egit help info (git://ev...@ra.../gitroot/rails/rails). > > >> I wonder: could and should I also insert my password? Now I'm > > >> asked to type my Sourceforge password *every* time I access remote > > >> (Subversive only required it once per Eclipse session). I could not > > >> find a place to configure that either. > > >> > > >> > During the clone the fields for authentication were grayed out. > > >> > > >> Can't remember. > > >> > > >> > During the push I never got asked for my user-account or password > > >> > on sourceforge. > > >> > > >> I think I was asked for my password only, as I had included mu > > >> username in the URL. > > >> > > >> > I was not able to locate anywhere in all those Eclipse dialogs > > >> > where I > > >> > > >> might be > > >> > > >> > able to setup my account. > > >> > > >> The only place I found was in the Push Wizard (Team|Remote|Push), > > >> but I haven't used the Custom part of that either. > > >> > > >> > Could you please provide help? > > >> > > >> Unfortunately I can't speak the final word on this matter. Let's > > >> together try to find what works best. > > >> > > >> Erik. > > >> > > >> > > >> ------------------------------------------------------------------- > > >> ----- > > >> --- --- 10 Tips for Better Web Security Learn 10 ways to better > > >> secure your business today. Topics covered > > >> include: Web security, SSL, hacker attacks & Denial of Service > > >> (DoS), private keys, security Microsoft Exchange, secure Instant > > >> Messaging, and much more. > > >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > >> _______________________________________________ > > >> Rails-devel mailing list > > >> Rai...@li... > > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > -------------------------------------------------------------------- > > > ----- > > > ----- 10 Tips for Better Web Security Learn 10 ways to better secure > > > your business today. Topics covered > > > include: Web security, SSL, hacker attacks & Denial of Service > > > (DoS), private keys, security Microsoft Exchange, secure Instant > > > Messaging, and much more. > > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ---------------------------------------------------------------------- > > ----- > > --- 10 Tips for Better Web Security > > Learn 10 ways to better secure your business today. Topics covered > include: > > Web security, SSL, hacker attacks & Denial of Service (DoS), private > > keys, security Microsoft Exchange, secure Instant Messaging, and much > more. > > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > ---------------------------------------------------------------------------- -- > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-20 16:36:40
|
I think I've got a commit-hook e-mail script that I like a bit more. Please ignore the test commit e-mails that were generated. ---Brett. On Tue, Jul 19, 2011 at 1:29 PM, brett lentz <bre...@gm...> wrote: > I'm still sorting out the commit message format. I'm not entirely > happy with it's current form. > > ---Brett. > > > > > ---------- Forwarded message ---------- > From: Brett Lentz <wak...@us...> > Date: Tue, Jul 19, 2011 at 1:27 PM > Subject: [Rails-commits] [rails-commits]Rails: An 18xx game moderator. > branch, master, updated. v1.4.2-49-ge18b0fe > To: rai...@li... > > > This is an automated email from the git hooks/post-receive script. It was > generated because a ref change was pushed to the repository containing > the project "Rails: An 18xx game moderator.". > > The branch, master has been updated > via e18b0fe55665e87abd3479ac831b127fb583c370 (commit) > from fd4a38bce3687b9c5d6642e2984320bca390b07d (commit) > > Those revisions listed above that are new to this repository have > not appeared on any other notification email; so we list those > revisions in full, below. > > - Log ----------------------------------------------------------------- > commit e18b0fe55665e87abd3479ac831b127fb583c370 > Author: Brett Lentz <bl...@cl...> > Date: Tue Jul 19 13:27:24 2011 -0700 > > Don't forget to parse the Notes. > > ----------------------------------------------------------------------- > > Summary of changes: > rails/common/parser/GameInfoParser.java | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > > hooks/post-receive > -- > Rails: An 18xx game moderator. > > ------------------------------------------------------------------------------ > Magic Quadrant for Content-Aware Data Loss Prevention > Research study explores the data loss prevention market. Includes in-depth > analysis on the changes within the DLP market, and the criteria used to > evaluate the strengths and weaknesses of these DLP solutions. > http://www.accelacomm.com/jaw/sfnl/114/51385063/ > _______________________________________________ > Rails-commits mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-commits > |
From: brett l. <bre...@gm...> - 2011-07-20 15:05:21
|
Nothing changed on my side. :-) ---Brett. On Wed, Jul 20, 2011 at 8:02 AM, Stefan Frey <ste...@we...> wrote: > Brett: > sorry I was using the wrong wording below (still kept somehow in my > subversion-world, where a branch is a copy of the trunk). > > I did not clone the local repo, instead I created a branch inside the same > repo. So my actual workflow was the one you suggested below. > > So I have two branches shown in the git explorer of egit: master and h_train. > > Anyhow I tested things again in the last half hour and it did not work first, > but now it worked out of the blue. > > Have you changed anything on the settings or did I torture egit for so long, > that it had pity with me. > > Stefan > > > > > On Wednesday, July 20, 2011 04:45:02 pm brett lentz wrote: >> Comments inline... >> >> On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> wrote: >> > Actually I had to use the push uri: >> > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails >> > >> > Using the git protocol was not possible, as egit complained that it >> > does not support a username. >> >> Correct. To be able to push changes, your remote uri needs to be the ssh >> uri. >> >> You can modify this setting on the fly, and don't need to re-clone the >> repository. The "git config" CLI commands can update any repository >> setting. >> >> > I prefer not to use the synchronize perspective with git, as I wonder >> > what it actually shows, as there are now two states of changes (changes >> > not committed, changes committed but not pushed yet). >> >> I'm not yet familiar with EGit, so most of the following information >> will be based on my knowledge of the CLI tools. >> >> > So my intended workflow to implement a new feature was: >> > A) Create a branch for that feature locally by cloning my local master >> > which is itself a clone of the remote master. >> > B) Commit the changes in the local branch. >> > C) Push/merge those changes into my local master. >> > D) Push the changes from the local master into the remote master. >> >> Creating two local repositories is unnecessary and might be adding >> extra complications to your workflow. >> >> Let's see if we can get the simple use case working, then you can >> decide if you need more. >> >> Try doing this: >> >> 1. Create a topic branch. >> 2. Work as needed in the topic branch, making local commits when it makes >> sense. 3. When you've got an amount of work that's ready to push, update >> your local master and then merge your topic branch to your local master. >> 4. Push your changes to the remote repository. >> >> Let's even save rebasing for later. >> >> > Unfortunately I was not able to push the changes to the master branch, I >> > got a rejected error message for this (both on dry run and real). But my >> > local master is up-to-date with the repo master. >> >> If you post the error message, it would help. >> >> The most common reasons for a failed push are: >> >> 1. Authentication and permissions problems (including using the wrong >> remote.origin.url. >> 2. Local branch being out of sync with remote branch. (try a git pull, >> then retry your push.) >> >> Unline SVN, Git won't let you push changes if your local tree is out >> of sync with the remote tree. You need to pull any remote changes into >> your local tree, resolve any merge conflicts (if any) locally, then >> push your changes. >> >> > However I was able to push my branch H_train into the repo and was able >> > to push my committed changes there. >> > >> > My ref spec for the push to the master is: >> > refs/heads/master:refs/heads/master >> >> This looks correct. >> >> It would be more useful to diagnose the issue to do this: >> >> $ git fetch >> $ git status >> $ git branch -vv >> $ git diff origin/master master --stat >> >> The fetch will update your remote refs without changing your working >> copy. Git pull simply is a shortcut to running fetch then either merge >> or rebase (depending on chosen options). >> >> The output of the status, branch, and diff commands will tell you how >> out of sync you are with the remote side, often telling you how many >> commits ahead or behind you are. >> >> > What have I done wrong? >> > Maybe it is better to wait for Brett to help here, I do not want to break >> > anything and he has daily working knowledge with git. >> > >> > Stefan >> >> ---Brett. >> >> > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: >> >> See below for my findings >> >> >> >> > -----Original Message----- >> >> > From: Stefan Frey [mailto:ste...@we...] >> >> > >> >> > Brett or Erik: >> >> > I believe I am doing something wrong or something is not setup >> >> > correctly, >> >> >> >> but >> >> >> >> > I do not get the push working after the commit. >> >> > >> >> > I did setup a complete new workspace for git, cloned remote, changed >> >> > , committed, then pushed to remote. >> >> > All steps worked, except the final push. >> >> >> >> I did the same thing, and it all appears to have worked. I'm not happy >> >> with the way Egit reports a successful push: the synchronization view is >> >> not updated (unlike Subversive, which cleaned up that view after a >> >> commit). Basically I have to conclude success from the absence of error >> >> messages; I would have preferred some positive message. >> >> >> >> > The error message I get is that the push is not permitted. >> >> > >> >> > My thoughts are: >> >> > >> >> > I have not setup a specific push-URI, only used the sourceforge link >> >> > git://rails.git.sourceforge.net/gitroot/rails/rails >> >> >> >> Same as I did, except that I had inserted my username, as per the Egit >> >> help info (git://ev...@ra.../gitroot/rails/rails). >> >> I wonder: could and should I also insert my password? Now I'm asked to >> >> type my Sourceforge password *every* time I access remote (Subversive >> >> only required it once per Eclipse session). I could not find a place to >> >> configure that either. >> >> >> >> > During the clone the fields for authentication were grayed out. >> >> >> >> Can't remember. >> >> >> >> > During the push I never got asked for my user-account or password on >> >> > sourceforge. >> >> >> >> I think I was asked for my password only, as I had included mu username >> >> in the URL. >> >> >> >> > I was not able to locate anywhere in all those Eclipse dialogs where I >> >> >> >> might be >> >> >> >> > able to setup my account. >> >> >> >> The only place I found was in the Push Wizard (Team|Remote|Push), but I >> >> haven't used the Custom part of that either. >> >> >> >> > Could you please provide help? >> >> >> >> Unfortunately I can't speak the final word on this matter. Let's >> >> together try to find what works best. >> >> >> >> Erik. >> >> >> >> >> >> ------------------------------------------------------------------------ >> >> --- --- 10 Tips for Better Web Security >> >> Learn 10 ways to better secure your business today. Topics covered >> >> include: Web security, SSL, hacker attacks & Denial of Service (DoS), >> >> private keys, security Microsoft Exchange, secure Instant Messaging, >> >> and much more. http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> >> _______________________________________________ >> >> Rails-devel mailing list >> >> Rai...@li... >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > ------------------------------------------------------------------------- >> > ----- 10 Tips for Better Web Security >> > Learn 10 ways to better secure your business today. Topics covered >> > include: Web security, SSL, hacker attacks & Denial of Service (DoS), >> > private keys, security Microsoft Exchange, secure Instant Messaging, and >> > much more. http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> --------------------------------------------------------------------------- >> --- 10 Tips for Better Web Security >> Learn 10 ways to better secure your business today. Topics covered include: >> Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, >> security Microsoft Exchange, secure Instant Messaging, and much more. >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > ------------------------------------------------------------------------------ > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Stefan F. <ste...@we...> - 2011-07-20 15:00:44
|
Brett: sorry I was using the wrong wording below (still kept somehow in my subversion-world, where a branch is a copy of the trunk). I did not clone the local repo, instead I created a branch inside the same repo. So my actual workflow was the one you suggested below. So I have two branches shown in the git explorer of egit: master and h_train. Anyhow I tested things again in the last half hour and it did not work first, but now it worked out of the blue. Have you changed anything on the settings or did I torture egit for so long, that it had pity with me. Stefan On Wednesday, July 20, 2011 04:45:02 pm brett lentz wrote: > Comments inline... > > On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> wrote: > > Actually I had to use the push uri: > > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails > > > > Using the git protocol was not possible, as egit complained that it > > does not support a username. > > Correct. To be able to push changes, your remote uri needs to be the ssh > uri. > > You can modify this setting on the fly, and don't need to re-clone the > repository. The "git config" CLI commands can update any repository > setting. > > > I prefer not to use the synchronize perspective with git, as I wonder > > what it actually shows, as there are now two states of changes (changes > > not committed, changes committed but not pushed yet). > > I'm not yet familiar with EGit, so most of the following information > will be based on my knowledge of the CLI tools. > > > So my intended workflow to implement a new feature was: > > A) Create a branch for that feature locally by cloning my local master > > which is itself a clone of the remote master. > > B) Commit the changes in the local branch. > > C) Push/merge those changes into my local master. > > D) Push the changes from the local master into the remote master. > > Creating two local repositories is unnecessary and might be adding > extra complications to your workflow. > > Let's see if we can get the simple use case working, then you can > decide if you need more. > > Try doing this: > > 1. Create a topic branch. > 2. Work as needed in the topic branch, making local commits when it makes > sense. 3. When you've got an amount of work that's ready to push, update > your local master and then merge your topic branch to your local master. > 4. Push your changes to the remote repository. > > Let's even save rebasing for later. > > > Unfortunately I was not able to push the changes to the master branch, I > > got a rejected error message for this (both on dry run and real). But my > > local master is up-to-date with the repo master. > > If you post the error message, it would help. > > The most common reasons for a failed push are: > > 1. Authentication and permissions problems (including using the wrong > remote.origin.url. > 2. Local branch being out of sync with remote branch. (try a git pull, > then retry your push.) > > Unline SVN, Git won't let you push changes if your local tree is out > of sync with the remote tree. You need to pull any remote changes into > your local tree, resolve any merge conflicts (if any) locally, then > push your changes. > > > However I was able to push my branch H_train into the repo and was able > > to push my committed changes there. > > > > My ref spec for the push to the master is: > > refs/heads/master:refs/heads/master > > This looks correct. > > It would be more useful to diagnose the issue to do this: > > $ git fetch > $ git status > $ git branch -vv > $ git diff origin/master master --stat > > The fetch will update your remote refs without changing your working > copy. Git pull simply is a shortcut to running fetch then either merge > or rebase (depending on chosen options). > > The output of the status, branch, and diff commands will tell you how > out of sync you are with the remote side, often telling you how many > commits ahead or behind you are. > > > What have I done wrong? > > Maybe it is better to wait for Brett to help here, I do not want to break > > anything and he has daily working knowledge with git. > > > > Stefan > > ---Brett. > > > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: > >> See below for my findings > >> > >> > -----Original Message----- > >> > From: Stefan Frey [mailto:ste...@we...] > >> > > >> > Brett or Erik: > >> > I believe I am doing something wrong or something is not setup > >> > correctly, > >> > >> but > >> > >> > I do not get the push working after the commit. > >> > > >> > I did setup a complete new workspace for git, cloned remote, changed > >> > , committed, then pushed to remote. > >> > All steps worked, except the final push. > >> > >> I did the same thing, and it all appears to have worked. I'm not happy > >> with the way Egit reports a successful push: the synchronization view is > >> not updated (unlike Subversive, which cleaned up that view after a > >> commit). Basically I have to conclude success from the absence of error > >> messages; I would have preferred some positive message. > >> > >> > The error message I get is that the push is not permitted. > >> > > >> > My thoughts are: > >> > > >> > I have not setup a specific push-URI, only used the sourceforge link > >> > git://rails.git.sourceforge.net/gitroot/rails/rails > >> > >> Same as I did, except that I had inserted my username, as per the Egit > >> help info (git://ev...@ra.../gitroot/rails/rails). > >> I wonder: could and should I also insert my password? Now I'm asked to > >> type my Sourceforge password *every* time I access remote (Subversive > >> only required it once per Eclipse session). I could not find a place to > >> configure that either. > >> > >> > During the clone the fields for authentication were grayed out. > >> > >> Can't remember. > >> > >> > During the push I never got asked for my user-account or password on > >> > sourceforge. > >> > >> I think I was asked for my password only, as I had included mu username > >> in the URL. > >> > >> > I was not able to locate anywhere in all those Eclipse dialogs where I > >> > >> might be > >> > >> > able to setup my account. > >> > >> The only place I found was in the Push Wizard (Team|Remote|Push), but I > >> haven't used the Custom part of that either. > >> > >> > Could you please provide help? > >> > >> Unfortunately I can't speak the final word on this matter. Let's > >> together try to find what works best. > >> > >> Erik. > >> > >> > >> ------------------------------------------------------------------------ > >> --- --- 10 Tips for Better Web Security > >> Learn 10 ways to better secure your business today. Topics covered > >> include: Web security, SSL, hacker attacks & Denial of Service (DoS), > >> private keys, security Microsoft Exchange, secure Instant Messaging, > >> and much more. http://www.accelacomm.com/jaw/sfnl/114/51426210/ > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------- > > ----- 10 Tips for Better Web Security > > Learn 10 ways to better secure your business today. Topics covered > > include: Web security, SSL, hacker attacks & Denial of Service (DoS), > > private keys, security Microsoft Exchange, secure Instant Messaging, and > > much more. http://www.accelacomm.com/jaw/sfnl/114/51426210/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > --------------------------------------------------------------------------- > --- 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-20 14:45:29
|
Comments inline... On Wed, Jul 20, 2011 at 4:39 AM, Stefan Frey <ste...@we...> wrote: > Actually I had to use the push uri: > ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails > > Using the git protocol was not possible, as egit complained that it > does not support a username. Correct. To be able to push changes, your remote uri needs to be the ssh uri. You can modify this setting on the fly, and don't need to re-clone the repository. The "git config" CLI commands can update any repository setting. > I prefer not to use the synchronize perspective with git, as I wonder what it > actually shows, as there are now two states of changes (changes not committed, > changes committed but not pushed yet). I'm not yet familiar with EGit, so most of the following information will be based on my knowledge of the CLI tools. > So my intended workflow to implement a new feature was: > A) Create a branch for that feature locally by cloning my local master which > is itself a clone of the remote master. > B) Commit the changes in the local branch. > C) Push/merge those changes into my local master. > D) Push the changes from the local master into the remote master. > Creating two local repositories is unnecessary and might be adding extra complications to your workflow. Let's see if we can get the simple use case working, then you can decide if you need more. Try doing this: 1. Create a topic branch. 2. Work as needed in the topic branch, making local commits when it makes sense. 3. When you've got an amount of work that's ready to push, update your local master and then merge your topic branch to your local master. 4. Push your changes to the remote repository. Let's even save rebasing for later. > Unfortunately I was not able to push the changes to the master branch, I got a > rejected error message for this (both on dry run and real). But my local > master is up-to-date with the repo master. > If you post the error message, it would help. The most common reasons for a failed push are: 1. Authentication and permissions problems (including using the wrong remote.origin.url. 2. Local branch being out of sync with remote branch. (try a git pull, then retry your push.) Unline SVN, Git won't let you push changes if your local tree is out of sync with the remote tree. You need to pull any remote changes into your local tree, resolve any merge conflicts (if any) locally, then push your changes. > However I was able to push my branch H_train into the repo and was able to > push my committed changes there. > > My ref spec for the push to the master is: > refs/heads/master:refs/heads/master > This looks correct. It would be more useful to diagnose the issue to do this: $ git fetch $ git status $ git branch -vv $ git diff origin/master master --stat The fetch will update your remote refs without changing your working copy. Git pull simply is a shortcut to running fetch then either merge or rebase (depending on chosen options). The output of the status, branch, and diff commands will tell you how out of sync you are with the remote side, often telling you how many commits ahead or behind you are. > What have I done wrong? > Maybe it is better to wait for Brett to help here, I do not want to break > anything and he has daily working knowledge with git. > > Stefan > > ---Brett. > > > On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: >> See below for my findings >> >> > -----Original Message----- >> > From: Stefan Frey [mailto:ste...@we...] >> > >> > Brett or Erik: >> > I believe I am doing something wrong or something is not setup correctly, >> >> but >> >> > I do not get the push working after the commit. >> > >> > I did setup a complete new workspace for git, cloned remote, changed , >> > committed, then pushed to remote. >> > All steps worked, except the final push. >> >> I did the same thing, and it all appears to have worked. I'm not happy >> with the way Egit reports a successful push: the synchronization view is >> not updated (unlike Subversive, which cleaned up that view after a >> commit). Basically I have to conclude success from the absence of error >> messages; I would have preferred some positive message. >> >> > The error message I get is that the push is not permitted. >> > >> > My thoughts are: >> > >> > I have not setup a specific push-URI, only used the sourceforge link >> > git://rails.git.sourceforge.net/gitroot/rails/rails >> >> Same as I did, except that I had inserted my username, as per the Egit help >> info (git://ev...@ra.../gitroot/rails/rails). I wonder: >> could and should I also insert my password? Now I'm asked to type my >> Sourceforge password *every* time I access remote (Subversive only required >> it once per Eclipse session). I could not find a place to configure that >> either. >> >> > During the clone the fields for authentication were grayed out. >> >> Can't remember. >> >> > During the push I never got asked for my user-account or password on >> > sourceforge. >> >> I think I was asked for my password only, as I had included mu username in >> the URL. >> >> > I was not able to locate anywhere in all those Eclipse dialogs where I >> >> might be >> >> > able to setup my account. >> >> The only place I found was in the Push Wizard (Team|Remote|Push), but I >> haven't used the Custom part of that either. >> >> > Could you please provide help? >> >> Unfortunately I can't speak the final word on this matter. Let's together >> try to find what works best. >> >> Erik. >> >> >> --------------------------------------------------------------------------- >> --- 10 Tips for Better Web Security >> Learn 10 ways to better secure your business today. Topics covered include: >> Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, >> security Microsoft Exchange, secure Instant Messaging, and much more. >> http://www.accelacomm.com/jaw/sfnl/114/51426210/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > ------------------------------------------------------------------------------ > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Scott P. <sc...@re...> - 2011-07-20 13:41:07
|
On Wed, Jul 20, 2011 at 8:32 AM, John A. Tamplin <ja...@ja...> wrote: > > BTW, note that there are two types of hex trains -- in 1844 a 2H train runs > to two adjacent hexes, while in 18US a 1H train runs to two adjacent hexes > (ie, it has a range of 1 from the origin). You can represent them > internally the same way, but you need to display them differently. > We can already name the trains whatever we want. In the XML files, the train's capability is simply a parameter and is not related to the name. |
From: John A. T. <ja...@ja...> - 2011-07-20 13:33:10
|
On Wed, Jul 20, 2011 at 2:18 AM, Stefan Frey <ste...@we...> wrote: > I have implemented revenue calculation for hex trains (for 1826). Instead > of a > dynamic modifier I kept the (older) plan to add that to the revenue > calculator > directly. So I treat hex trains as "first-class" citizens of Rails and they > should be supported directly via attributes in XML. > > What is your preference for the naming and type of such an attribute? > I would currently prefer a simple boolean isHexTrain = "yes" and (mis-) use > the number of majors as the number of hexes the train can travel. > > But maybe something like distanceType={stops|hexes} and then an integer > attribute for hexDistance is preferable? > BTW, note that there are two types of hex trains -- in 1844 a 2H train runs to two adjacent hexes, while in 18US a 1H train runs to two adjacent hexes (ie, it has a range of 1 from the origin). You can represent them internally the same way, but you need to display them differently. -- John A. Tamplin |
From: Stefan F. <ste...@we...> - 2011-07-20 11:37:09
|
Erik: thanks for the help. I am getting close to what I intended, but I am not there yet. Actually I had to use the push uri: ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails Using the git protocol was not possible, as egit complained that it does not support a username. I prefer not to use the synchronize perspective with git, as I wonder what it actually shows, as there are now two states of changes (changes not committed, changes committed but not pushed yet). So my intended workflow to implement a new feature was: A) Create a branch for that feature locally by cloning my local master which is itself a clone of the remote master. B) Commit the changes in the local branch. C) Push/merge those changes into my local master. D) Push the changes from the local master into the remote master. Unfortunately I was not able to push the changes to the master branch, I got a rejected error message for this (both on dry run and real). But my local master is up-to-date with the repo master. However I was able to push my branch H_train into the repo and was able to push my committed changes there. My ref spec for the push to the master is: refs/heads/master:refs/heads/master What have I done wrong? Maybe it is better to wait for Brett to help here, I do not want to break anything and he has daily working knowledge with git. Stefan On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: > See below for my findings > > > -----Original Message----- > > From: Stefan Frey [mailto:ste...@we...] > > > > Brett or Erik: > > I believe I am doing something wrong or something is not setup correctly, > > but > > > I do not get the push working after the commit. > > > > I did setup a complete new workspace for git, cloned remote, changed , > > committed, then pushed to remote. > > All steps worked, except the final push. > > I did the same thing, and it all appears to have worked. I'm not happy > with the way Egit reports a successful push: the synchronization view is > not updated (unlike Subversive, which cleaned up that view after a > commit). Basically I have to conclude success from the absence of error > messages; I would have preferred some positive message. > > > The error message I get is that the push is not permitted. > > > > My thoughts are: > > > > I have not setup a specific push-URI, only used the sourceforge link > > git://rails.git.sourceforge.net/gitroot/rails/rails > > Same as I did, except that I had inserted my username, as per the Egit help > info (git://ev...@ra.../gitroot/rails/rails). I wonder: > could and should I also insert my password? Now I'm asked to type my > Sourceforge password *every* time I access remote (Subversive only required > it once per Eclipse session). I could not find a place to configure that > either. > > > During the clone the fields for authentication were grayed out. > > Can't remember. > > > During the push I never got asked for my user-account or password on > > sourceforge. > > I think I was asked for my password only, as I had included mu username in > the URL. > > > I was not able to locate anywhere in all those Eclipse dialogs where I > > might be > > > able to setup my account. > > The only place I found was in the Push Wizard (Team|Remote|Push), but I > haven't used the Custom part of that either. > > > Could you please provide help? > > Unfortunately I can't speak the final word on this matter. Let's together > try to find what works best. > > Erik. > > > --------------------------------------------------------------------------- > --- 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: Erik V. <eri...@xs...> - 2011-07-20 09:12:47
|
See below for my findings > -----Original Message----- > From: Stefan Frey [mailto:ste...@we...] > > Brett or Erik: > I believe I am doing something wrong or something is not setup correctly, but > I do not get the push working after the commit. > > I did setup a complete new workspace for git, cloned remote, changed , > committed, then pushed to remote. > All steps worked, except the final push. I did the same thing, and it all appears to have worked. I'm not happy with the way Egit reports a successful push: the synchronization view is not updated (unlike Subversive, which cleaned up that view after a commit). Basically I have to conclude success from the absence of error messages; I would have preferred some positive message. > The error message I get is that the push is not permitted. > > My thoughts are: > > I have not setup a specific push-URI, only used the sourceforge link > git://rails.git.sourceforge.net/gitroot/rails/rails Same as I did, except that I had inserted my username, as per the Egit help info (git://ev...@ra.../gitroot/rails/rails). I wonder: could and should I also insert my password? Now I'm asked to type my Sourceforge password *every* time I access remote (Subversive only required it once per Eclipse session). I could not find a place to configure that either. > During the clone the fields for authentication were grayed out. Can't remember. > During the push I never got asked for my user-account or password on > sourceforge. I think I was asked for my password only, as I had included mu username in the URL. > I was not able to locate anywhere in all those Eclipse dialogs where I might be > able to setup my account. The only place I found was in the Push Wizard (Team|Remote|Push), but I haven't used the Custom part of that either. > Could you please provide help? Unfortunately I can't speak the final word on this matter. Let's together try to find what works best. Erik. |
From: Erik V. <eri...@xs...> - 2011-07-20 08:52:06
|
Stefan, My original intention was to set this attribute in the <Reach> tag. See this fragment from 1830/Game.xml: <Reach base="stops" countTowns="yes"/> <!-- Alternative values: base="hexes" for H-trains as in 1826, 1849 etc. countTowns="no" for all trains in 1841, 18EU, etc., where towns score but do not count against the train length. Otherwise, towns are counted as minor or major stops, depending on the presence or absence of a "minorStops" value. --> This all dates back to the early days when everything was provisional. It's basically up to you how to work this out for hex trains, but I'll express my thoughts below. I admit that 'base' is not very descriptive, these days I would probably have looked for a better word, something like 'reachBase' or 'countingBase'. But I doubt if it's worthwhile to change it. For the hex count you could reuse 'majorStops', but it's nicer to call it 'hexes'. Internally these could point to the same integer variable (or not). Keep in mind that in one game (1844) the hex count includes the starting hex; in all other H-train games it is excluded. Either another attribute must indicate this special case, or the official 'hexes' counts must be decreased by one in this game. You could also drop 'base' and detect from the presence of 'majorStops' or 'hexes' what type of train it is, but that's an approach that may not be to everybody's liking. In any case, these two attributes should exclude each other. If you ask for my personal preferences, the answer would be: - keep 'base' - use 'hexes' as an alias for 'majorStops' - don't add a special attribute for 1844. But, as said, it's up to you. Erik. > -----Original Message----- > From: Stefan Frey [mailto:ste...@we...] > Sent: Wednesday, July 20, 2011 8:18 AM > To: Development list for Rails: an 18xx game > Subject: [Rails-devel] Hex trains support > > Erik, > I have implemented revenue calculation for hex trains (for 1826). Instead of a > dynamic modifier I kept the (older) plan to add that to the revenue calculator > directly. So I treat hex trains as "first-class" citizens of Rails and they should > be supported directly via attributes in XML. > > What is your preference for the naming and type of such an attribute? > I would currently prefer a simple boolean isHexTrain = "yes" and (mis-) use > the number of majors as the number of hexes the train can travel. > > But maybe something like distanceType={stops|hexes} and then an integer > attribute for hexDistance is preferable? > Stefan > > ---------------------------------------------------------------------------- -- > 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: Stefan F. <ste...@we...> - 2011-07-20 06:16:08
|
Erik, I have implemented revenue calculation for hex trains (for 1826). Instead of a dynamic modifier I kept the (older) plan to add that to the revenue calculator directly. So I treat hex trains as "first-class" citizens of Rails and they should be supported directly via attributes in XML. What is your preference for the naming and type of such an attribute? I would currently prefer a simple boolean isHexTrain = "yes" and (mis-) use the number of majors as the number of hexes the train can travel. But maybe something like distanceType={stops|hexes} and then an integer attribute for hexDistance is preferable? Stefan |
From: Stefan F. <ste...@we...> - 2011-07-20 05:50:17
|
Brett or Erik: I believe I am doing something wrong or something is not setup correctly, but I do not get the push working after the commit. I did setup a complete new workspace for git, cloned remote, changed , committed, then pushed to remote. All steps worked, except the final push. The error message I get is that the push is not permitted. My thoughts are: I have not setup a specific push-URI, only used the sourceforge link git://rails.git.sourceforge.net/gitroot/rails/rails During the clone the fields for authentication were grayed out. During the push I never got asked for my user-account or password on sourceforge. I was not able to locate anywhere in all those Eclipse dialogs where I might be able to setup my account. Could you please provide help? Thanks, Stefan On Sunday, July 17, 2011 09:19:58 pm brett lentz wrote: > I've migrated all of the commits up to r1614 from SVN into the Git > repository on SF.net. > > Currently, none of the tags have been migrated due to differences in > how SVN and Git handle tags. I'll be pushing the tags up as soon as I > have them ready. > > Important note for committers: > > Please set up your .gitconfig to include your name and e-mail address > for all future commits. > > During the migration, you'll note I've converted all existing commits > to use this information. To have the tree remain consistent, you'll > need to follow suit. > > ---Brett. > > On Mon, Jul 11, 2011 at 1:31 PM, Erik Vos <eri...@xs...> wrote: > > That would be great. Thanks. > > Erik. > > > >> -----Original Message----- > >> From: brett lentz [mailto:bre...@gm...] > >> Sent: Monday, July 11, 2011 9:45 PM > >> To: Development list for Rails: an 18xx game > >> Subject: Re: [Rails-devel] Are we ready for Git? > >> > >> I'll work on it this week. This coming weekend should be a good target > >> for the cutover. > >> > >> ---Brett. > >> > >> On Mon, Jul 11, 2011 at 12:32 PM, Erik Vos <eri...@xs...> wrote: > >> > OK, it seems we are ready then for the switchover. > >> > > >> > Brett, when do you think you can have rebuilt the Git repo at > >> > Sourceforge? I suppose it's better to create a fresh new repository > >> > than to do a massive update to get the current old one up to date. > >> > > >> > Erik. > >> > > >> >> -----Original Message----- > >> >> From: Phil Davies [mailto:de...@gm...] > >> >> Sent: Monday, July 11, 2011 10:56 AM > >> >> To: Development list for Rails: an 18xx game > >> >> Subject: Re: [Rails-devel] Are we ready for Git? > >> >> > >> >> As far as I'm concerned it's really Brett, Erik and Stefan's decision > >> > > >> > being the > >> > > >> >> primary contributors to the project. IntelliJ has a Git plugin so > >> >> I'm > >> > > >> > sure I'll > >> > > >> >> work it out :) > >> >> > >> >> Phil > >> >> > >> >> On 11 July 2011 06:04, Stefan Frey <ste...@we...> wrote: > >> >> > Erik & Brett, > >> >> > given that you both had some long-time hands-on-experience with > >> >> > Maven (compared to my third-party recommendation and a short > >> >> > try-out) I agree to stay with the current setup. > >> >> > I had not tested EGit/JGit before, thus I considered them as > >> >> > competing products similar to the svn-support in eclipse ;-) Stefan > >> >> > > >> >> > On Sunday, July 10, 2011 07:08:05 pm brett lentz wrote: > >> >> >> On Sun, Jul 10, 2011 at 9:24 AM, Erik Vos <eri...@xs...> wrote: > >> >> >> >> -----Original Message----- > >> >> >> >> From: Stefan Frey [mailto:ste...@we...] > >> >> >> >> Sent: Sunday, July 10, 2011 2:42 PM > >> >> >> >> To: Development list for Rails: an 18xx game > >> >> >> >> Subject: Re: [Rails-devel] Are we ready for Git? > >> >> >> >> > >> >> >> >> Erik & Brett, > >> >> >> >> I am up for that move. Do you recommend JGit or Egit? > >> >> >> > > >> >> >> > AFAIK you need both (in Eclipse). > >> >> >> > >> >> >> Correct. > >> >> >> > >> >> >> JGit is the java git implementation. > >> >> >> EGit is the eclipse plugin built on top of JGit. > >> >> >> > >> >> >> >> I am wondering if you would consider to move to a maven build > >> >> >> >> at the same time. Ideally by changing to the maven recommended > >> >> >> >> repo > >> >> > >> >> layout. > >> >> > >> >> >> > Dunno. Brett is handling the builds (I only run either from > >> >> >> > Eclipse Run or from the published Rails jars). > >> >> >> > > >> >> >> > I hardly know anything about Maven. In the past I have been > >> >> >> > half-involved with some (old) projects that used Maven, and > >> >> >> > perhaps > >> >> > >> >> some other stuff. > >> >> > >> >> >> > What I remember about these projects was the ubiquitous presence > >> >> >> > of pom.xml files that did not mean anything to me (I wasn't > >> >> >> > really interested either - it worked). So I'm blank. > >> >> >> > >> >> >> I deal with Maven at my day job, and I'm not a fan. Perhaps as > >> >> >> Maven > >> >> >> 3 matures, it will improve in crucial areas. Right now, I really > >> >> >> dislike the way it handles dependency resolution, among other > >> >> >> things. > >> >> >> > >> >> >> > Perhaps we'll better restrict ourselves to one major step at a > >> >> >> > time? > >> >> >> > >> >> >> Agreed. > >> >> >> > >> >> >> > One thing on our Git repo that I have struggled with yesterday > >> >> >> > is that it seems to require that the .git directory would exist > >> >> >> > at the same level as all project directories (game, tile, data > >> >> >> > etc.). I was trying to get these directories below a src > >> >> >> > directory on the same level as .git (under the project root), > >> >> >> > but failed to get there. Not really a problem, but perhaps > >> > >> noteworthy. > >> > >> >> >> > Erik. > >> >> >> > >> >> >> ---Brett. > >> >> >> > >> >> >> ------------------------------------------------------------------ > >> >> >> --- > >> >> >> ------ > >> >> >> --- All of the data generated in your IT infrastructure is > >> >> >> seriously valuable. Why? It contains a definitive record of > >> >> >> application performance, security threats, fraudulent activity, > >> >> >> and more. Splunk takes this data and makes sense of it. IT sense. > >> >> >> And > >> > >> common sense. > >> > >> >> >> http://p.sf.net/sfu/splunk-d2d-c2 > >> >> >> _______________________________________________ > >> >> >> Rails-devel mailing list > >> >> >> Rai...@li... > >> >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> >> > > >> >> > ------------------------------------------------------------------- > >> >> > --- > >> >> > -------- All of the data generated in your IT infrastructure is > >> >> > seriously valuable. > >> >> > Why? It contains a definitive record of application performance, > >> >> > security threats, fraudulent activity, and more. Splunk takes this > >> >> > data and makes sense of it. IT sense. And common sense. > >> >> > http://p.sf.net/sfu/splunk-d2d-c2 > >> >> > _______________________________________________ > >> >> > Rails-devel mailing list > >> >> > Rai...@li... > >> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > >> > ---------------------------------------------------------------------- > >> > ------ > >> > -- > >> > > >> >> All of the data generated in your IT infrastructure is seriously > >> >> valuable. Why? It contains a definitive record of application > >> >> performance, security threats, fraudulent activity, and more. Splunk > >> >> takes this data and makes sense of it. IT sense. And common sense. > >> >> http://p.sf.net/sfu/splunk-d2d-c2 > >> >> _______________________________________________ > >> >> Rails-devel mailing list > >> >> Rai...@li... > >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > >> > ---------------------------------------------------------------------- > >> > -------- All of the data generated in your IT infrastructure is > >> > seriously valuable. > >> > Why? It contains a definitive record of application performance, > >> > security threats, fraudulent activity, and more. Splunk takes this > >> > data and makes sense of it. IT sense. And common sense. > >> > http://p.sf.net/sfu/splunk-d2d-c2 > >> > _______________________________________________ > >> > Rails-devel mailing list > >> > Rai...@li... > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> ------------------------------------------------------------------------ > >> ------ All of the data generated in your IT infrastructure is seriously > >> valuable. Why? It contains a definitive record of application > >> performance, security threats, fraudulent activity, and more. Splunk > >> takes this data and makes sense of it. IT sense. And common sense. > >> http://p.sf.net/sfu/splunk-d2d-c2 > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------- > > ----- All of the data generated in your IT infrastructure is seriously > > valuable. Why? It contains a definitive record of application > > performance, security threats, fraudulent activity, and more. Splunk > > takes this data and makes sense of it. IT sense. And common sense. > > http://p.sf.net/sfu/splunk-d2d-c2 > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > --------------------------------------------------------------------------- > --- AppSumo Presents a FREE Video for the SourceForge Community by Eric > Ries, the creator of the Lean Startup Methodology on "Lean Startup Secrets > Revealed." This video shows you how to validate your ideas, optimize your > ideas and identify your business strategy. > http://p.sf.net/sfu/appsumosfdev2dev > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-19 20:29:39
|
I'm still sorting out the commit message format. I'm not entirely happy with it's current form. ---Brett. ---------- Forwarded message ---------- From: Brett Lentz <wak...@us...> Date: Tue, Jul 19, 2011 at 1:27 PM Subject: [Rails-commits] [rails-commits]Rails: An 18xx game moderator. branch, master, updated. v1.4.2-49-ge18b0fe To: rai...@li... This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Rails: An 18xx game moderator.". The branch, master has been updated via e18b0fe55665e87abd3479ac831b127fb583c370 (commit) from fd4a38bce3687b9c5d6642e2984320bca390b07d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e18b0fe55665e87abd3479ac831b127fb583c370 Author: Brett Lentz <bl...@cl...> Date: Tue Jul 19 13:27:24 2011 -0700 Don't forget to parse the Notes. ----------------------------------------------------------------------- Summary of changes: rails/common/parser/GameInfoParser.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- Rails: An 18xx game moderator. ------------------------------------------------------------------------------ Magic Quadrant for Content-Aware Data Loss Prevention Research study explores the data loss prevention market. Includes in-depth analysis on the changes within the DLP market, and the criteria used to evaluate the strengths and weaknesses of these DLP solutions. http://www.accelacomm.com/jaw/sfnl/114/51385063/ _______________________________________________ Rails-commits mailing list Rai...@li... https://lists.sourceforge.net/lists/listinfo/rails-commits |
From: brett l. <bre...@gm...> - 2011-07-19 20:28:58
|
Ah. Now I see where it was lost. Apologies for the oversight. The fix has been committed. ---Brett. On Tue, Jul 19, 2011 at 12:20 PM, Erik Vos <eri...@xs...> wrote: > I think it is all explained by the fact that your GameInfoParser does not parse <Note>. > Erik. > >> -----Original Message----- >> From: brett lentz [mailto:bre...@gm...] >> Sent: Monday, July 18, 2011 11:54 PM >> To: Development list for Rails: an 18xx game >> Subject: Re: [Rails-devel] Game Notes (was: Git repository is now available.) >> >> Erik - >> >> Looking over my commit history, I don't see a call to setNote() in any of the >> diffs. >> >> I see where I moved GameInfo into rails.common.parser. GameInfo still has >> the setNote() method, but I can't locate any calls to it. >> >> ---Brett. >> >> >> >> On Mon, Jul 18, 2011 at 12:03 PM, brett lentz <bre...@gm...> >> wrote: >> > Hrm... I'd swear I moved that call into the new constructor. It was >> > working when I last tested it. >> > >> > I'll check it out and see what went wrong. >> > >> > ---Brett. >> > >> > >> > >> > On Mon, Jul 18, 2011 at 11:50 AM, Erik Vos <eri...@xs...> wrote: >> >> Brett, >> >> >> >> I think this is caused by your refactoring of game info parsing. >> >> GameInfo.setNote() is no longer called, so all notes stay at the >> >> default value "Notes". You seem to have overlooked <Note> in your new >> parser. >> >> >> >> Erik. >> >> >> >>> -----Original Message----- >> >>> From: Phil Davies [mailto:de...@gm...] >> >>> Sent: Monday, July 18, 2011 1:51 PM >> >>> To: Development list for Rails: an 18xx game >> >>> Subject: Re: [Rails-devel] Git repository is now available. >> >>> >> >>> Something strange in the version checked out from Git. On the >> >>> available games dialogue at startup, each game just ahs the word >> >>> 'Notes' next to it, rather than the previous designation of 'playable, >> unplayable' etc. >> >>> >> >> >> >> >> >> --------------------------------------------------------------------- >> >> --------- >> >> Storage Efficiency Calculator >> >> This modeling tool is based on patent-pending intellectual property >> >> that has been used successfully in hundreds of IBM storage >> >> optimization engage- ments, worldwide. Store less, Store more with >> >> what you own, Move data to the right place. Try It Now! >> >> http://www.accelacomm.com/jaw/sfnl/114/51427378/ >> >> _______________________________________________ >> >> Rails-devel mailing list >> >> Rai...@li... >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> >> > >> >> ------------------------------------------------------------------------------ >> Storage Efficiency Calculator >> This modeling tool is based on patent-pending intellectual property that has >> been used successfully in hundreds of IBM storage optimization engage- >> ments, worldwide. Store less, Store more with what you own, Move data to >> the right place. Try It Now! >> http://www.accelacomm.com/jaw/sfnl/114/51427378/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > ------------------------------------------------------------------------------ > Magic Quadrant for Content-Aware Data Loss Prevention > Research study explores the data loss prevention market. Includes in-depth > analysis on the changes within the DLP market, and the criteria used to > evaluate the strengths and weaknesses of these DLP solutions. > http://www.accelacomm.com/jaw/sfnl/114/51385063/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Erik V. <eri...@xs...> - 2011-07-19 19:20:49
|
I think it is all explained by the fact that your GameInfoParser does not parse <Note>. Erik. > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Monday, July 18, 2011 11:54 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Game Notes (was: Git repository is now available.) > > Erik - > > Looking over my commit history, I don't see a call to setNote() in any of the > diffs. > > I see where I moved GameInfo into rails.common.parser. GameInfo still has > the setNote() method, but I can't locate any calls to it. > > ---Brett. > > > > On Mon, Jul 18, 2011 at 12:03 PM, brett lentz <bre...@gm...> > wrote: > > Hrm... I'd swear I moved that call into the new constructor. It was > > working when I last tested it. > > > > I'll check it out and see what went wrong. > > > > ---Brett. > > > > > > > > On Mon, Jul 18, 2011 at 11:50 AM, Erik Vos <eri...@xs...> wrote: > >> Brett, > >> > >> I think this is caused by your refactoring of game info parsing. > >> GameInfo.setNote() is no longer called, so all notes stay at the > >> default value "Notes". You seem to have overlooked <Note> in your new > parser. > >> > >> Erik. > >> > >>> -----Original Message----- > >>> From: Phil Davies [mailto:de...@gm...] > >>> Sent: Monday, July 18, 2011 1:51 PM > >>> To: Development list for Rails: an 18xx game > >>> Subject: Re: [Rails-devel] Git repository is now available. > >>> > >>> Something strange in the version checked out from Git. On the > >>> available games dialogue at startup, each game just ahs the word > >>> 'Notes' next to it, rather than the previous designation of 'playable, > unplayable' etc. > >>> > >> > >> > >> --------------------------------------------------------------------- > >> --------- > >> Storage Efficiency Calculator > >> This modeling tool is based on patent-pending intellectual property > >> that has been used successfully in hundreds of IBM storage > >> optimization engage- ments, worldwide. Store less, Store more with > >> what you own, Move data to the right place. Try It Now! > >> http://www.accelacomm.com/jaw/sfnl/114/51427378/ > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > > > ------------------------------------------------------------------------------ > Storage Efficiency Calculator > This modeling tool is based on patent-pending intellectual property that has > been used successfully in hundreds of IBM storage optimization engage- > ments, worldwide. Store less, Store more with what you own, Move data to > the right place. Try It Now! > http://www.accelacomm.com/jaw/sfnl/114/51427378/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-18 21:54:56
|
Erik - Looking over my commit history, I don't see a call to setNote() in any of the diffs. I see where I moved GameInfo into rails.common.parser. GameInfo still has the setNote() method, but I can't locate any calls to it. ---Brett. On Mon, Jul 18, 2011 at 12:03 PM, brett lentz <bre...@gm...> wrote: > Hrm... I'd swear I moved that call into the new constructor. It was > working when I last tested it. > > I'll check it out and see what went wrong. > > ---Brett. > > > > On Mon, Jul 18, 2011 at 11:50 AM, Erik Vos <eri...@xs...> wrote: >> Brett, >> >> I think this is caused by your refactoring of game info parsing. >> GameInfo.setNote() is no longer called, so all notes stay at the default >> value "Notes". You seem to have overlooked <Note> in your new parser. >> >> Erik. >> >>> -----Original Message----- >>> From: Phil Davies [mailto:de...@gm...] >>> Sent: Monday, July 18, 2011 1:51 PM >>> To: Development list for Rails: an 18xx game >>> Subject: Re: [Rails-devel] Git repository is now available. >>> >>> Something strange in the version checked out from Git. On the available >>> games dialogue at startup, each game just ahs the word 'Notes' next to it, >>> rather than the previous designation of 'playable, unplayable' etc. >>> >> >> >> ------------------------------------------------------------------------------ >> Storage Efficiency Calculator >> This modeling tool is based on patent-pending intellectual property that >> has been used successfully in hundreds of IBM storage optimization engage- >> ments, worldwide. Store less, Store more with what you own, Move data to >> the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > |
From: Erik V. <eri...@xs...> - 2011-07-18 21:43:53
|
> > 3. When the 4+4 train is purchased (after the Prussian has formed), > > all players get asked whether to convert our remaining minors. (This > > is only supposed to happen (a) when the M2 converts, thus forming the > > Prussian, or > > (b) at the beginnings of rounds. Thus we should not be asked upon the > > 4+4 purchase unless the owner of M2 declined all earlier opportunities > > to form the Prussian and so is forced to form it then.) > > Confirmed, will be fixed. Fixed (Git commit df0250...). |
From: Erik V. <eri...@xs...> - 2011-07-18 21:42:39
|
OK, done (commit fd4a38...). > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Monday, July 18, 2011 9:54 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Git repository is now available. > > Yeah, that should be fine. > > ---Brett. > > > > On Mon, Jul 18, 2011 at 12:31 PM, Erik Vos <eri...@xs...> wrote: > > I was having a classpath problem: the builder could not find some jars > > that did not have "exported" status. > > > > <?xml version="1.0" encoding="UTF-8"?> <classpath> > > <classpathentry > > excluding="lib/batik-1.7/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3. > > 8.2/|l > > ib/log4j-1.2/|lib/batik-1.7/lib/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/j > > unit_3 .8.2/|lib/log4j-1.2/|lib/batik-1.7/|lib/batik-1.7/lib/" > > kind="src" path=""/> > > <classpathentry exported="true" kind="con" > > path="org.eclipse.jdt.launching.JRE_CONTAINER"/> > > <classpathentry kind="lib" > > path="lib/log4j-1.2/log4j-1.2.14.jar"/> > > <classpathentry kind="lib" > > path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> > > <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> > > <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> > > <classpathentry kind="lib" path="lib/batik-1.7/batik.jar"/> > > <classpathentry kind="lib" > > path="lib/batik-1.7/lib/batik-bridge.jar"/> > > <classpathentry kind="lib" > > path="lib/batik-1.7/lib/batik-dom.jar"/> > > <classpathentry kind="lib" > > path="lib/batik-1.7/lib/batik-ext.jar"/> > > <classpathentry kind="lib" > > path="lib/batik-1.7/lib/batik-gvt.jar"/> > > <classpathentry kind="lib" > > path="lib/batik-1.7/lib/batik-util.jar"/> > > <classpathentry kind="output" path="classes"/> </classpath> > > > > Adding exported="true" to all entries fixed that. > > > > I'm not sure what logic is behind this, but is it OK to commit this change? > > > > Erik. > > > > > >> -----Original Message----- > >> From: Erik Vos [mailto:eri...@xs...] > >> Sent: Monday, July 18, 2011 11:11 AM > >> To: 'Development list for Rails: an 18xx game' > >> Subject: Re: [Rails-devel] Git repository is now available. > >> > >> OK, I have imported the new repository via Eclipse, and all seems well. > >> Later this week I'll try to resume bug fixing and other useful work. > >> > >> Erik. > >> > >> > -----Original Message----- > >> > From: brett lentz [mailto:bre...@gm...] > >> > Sent: Sunday, July 17, 2011 9:20 PM > >> > To: Development list for Rails: an 18xx game > >> > Subject: [Rails-devel] Git repository is now available. > >> > > >> > I've migrated all of the commits up to r1614 from SVN into the Git > >> > repository on SF.net. > >> > > >> > Currently, none of the tags have been migrated due to differences > >> > in how SVN and Git handle tags. I'll be pushing the tags up as soon > >> > as I have them ready. > >> > > >> > Important note for committers: > >> > > >> > Please set up your .gitconfig to include your name and e-mail > >> > address for all future commits. > >> > > >> > During the migration, you'll note I've converted all existing > >> > commits to use this information. To have the tree remain > >> > consistent, you'll need to follow suit. > >> > > >> > ---Brett. > >> > > >> > > >> > > >> > On Mon, Jul 11, 2011 at 1:31 PM, Erik Vos <eri...@xs...> wrote: > >> > > That would be great. Thanks. > >> > > Erik. > >> > > > >> > >> -----Original Message----- > >> > >> From: brett lentz [mailto:bre...@gm...] > >> > >> Sent: Monday, July 11, 2011 9:45 PM > >> > >> To: Development list for Rails: an 18xx game > >> > >> Subject: Re: [Rails-devel] Are we ready for Git? > >> > >> > >> > >> I'll work on it this week. This coming weekend should be a good > >> > >> target for the cutover. > >> > >> > >> > >> ---Brett. > >> > >> > >> > >> > >> > >> > >> > >> On Mon, Jul 11, 2011 at 12:32 PM, Erik Vos <eri...@xs...> > > wrote: > >> > >> > OK, it seems we are ready then for the switchover. > >> > >> > > >> > >> > Brett, when do you think you can have rebuilt the Git repo at > >> > Sourceforge? > >> > >> > I suppose it's better to create a fresh new repository than to > >> > >> > do a massive update to get the current old one up to date. > >> > >> > > >> > >> > Erik. > >> > >> > > >> > >> >> -----Original Message----- > >> > >> >> From: Phil Davies [mailto:de...@gm...] > >> > >> >> Sent: Monday, July 11, 2011 10:56 AM > >> > >> >> To: Development list for Rails: an 18xx game > >> > >> >> Subject: Re: [Rails-devel] Are we ready for Git? > >> > >> >> > >> > >> >> As far as I'm concerned it's really Brett, Erik and Stefan's > >> > >> >> decision > >> > >> > being the > >> > >> >> primary contributors to the project. IntelliJ has a Git > >> > >> >> plugin so I'm > >> > >> > sure I'll > >> > >> >> work it out :) > >> > >> >> > >> > >> >> Phil > >> > >> >> > >> > >> >> On 11 July 2011 06:04, Stefan Frey <ste...@we...> wrote: > >> > >> >> > Erik & Brett, > >> > >> >> > given that you both had some long-time hands-on-experience > >> > >> >> > with Maven (compared to my third-party recommendation and > a > >> > >> >> > short > >> > >> >> > try-out) I agree to stay with the current setup. > >> > >> >> > I had not tested EGit/JGit before, thus I considered them > >> > >> >> > as competing products similar to the svn-support in eclipse > >> > >> >> > ;-) Stefan > >> > >> >> > > >> > >> >> > On Sunday, July 10, 2011 07:08:05 pm brett lentz wrote: > >> > >> >> >> On Sun, Jul 10, 2011 at 9:24 AM, Erik Vos > >> > >> >> >> <eri...@xs...> > >> > wrote: > >> > >> >> >> >> -----Original Message----- > >> > >> >> >> >> From: Stefan Frey [mailto:ste...@we...] > >> > >> >> >> >> Sent: Sunday, July 10, 2011 2:42 PM > >> > >> >> >> >> To: Development list for Rails: an 18xx game > >> > >> >> >> >> Subject: Re: [Rails-devel] Are we ready for Git? > >> > >> >> >> >> > >> > >> >> >> >> Erik & Brett, > >> > >> >> >> >> I am up for that move. Do you recommend JGit or Egit? > >> > >> >> >> > > >> > >> >> >> > AFAIK you need both (in Eclipse). > >> > >> >> >> > >> > >> >> >> Correct. > >> > >> >> >> > >> > >> >> >> JGit is the java git implementation. > >> > >> >> >> EGit is the eclipse plugin built on top of JGit. > >> > >> >> >> > >> > >> >> >> >> I am wondering if you would consider to move to a maven > >> > >> >> >> >> build at the same time. Ideally by changing to the > >> > >> >> >> >> maven recommended repo > >> > >> >> layout. > >> > >> >> >> > > >> > >> >> >> > Dunno. Brett is handling the builds (I only run either > >> > >> >> >> > from Eclipse Run or from the published Rails jars). > >> > >> >> >> > > >> > >> >> >> > I hardly know anything about Maven. In the past I have > >> > >> >> >> > been half-involved with some (old) projects that used > >> > >> >> >> > Maven, and perhaps > >> > >> >> some other stuff. > >> > >> >> >> > What I remember about these projects was the ubiquitous > >> > >> >> >> > presence of pom.xml files that did not mean anything to > >> > >> >> >> > me (I wasn't really interested either - it worked). So > >> > >> >> >> > I'm > > blank. > >> > >> >> >> > >> > >> >> >> I deal with Maven at my day job, and I'm not a fan. > >> > >> >> >> Perhaps as Maven > >> > >> >> >> 3 matures, it will improve in crucial areas. Right now, I > >> > >> >> >> really dislike the way it handles dependency resolution, > >> > >> >> >> among > >> > other things. > >> > >> >> >> > >> > >> >> >> > Perhaps we'll better restrict ourselves to one major > >> > >> >> >> > step at a > >> > time? > >> > >> >> >> > >> > >> >> >> Agreed. > >> > >> >> >> > >> > >> >> >> > One thing on our Git repo that I have struggled with > >> > >> >> >> > yesterday is that it seems to require that the .git > >> > >> >> >> > directory would exist at the same level as all project > >> > >> >> >> > directories (game, tile, data etc.). I was trying to > >> > >> >> >> > get these directories below a src directory on the same > >> > >> >> >> > level as .git (under the project root), but failed to get there. > >> > >> >> >> > Not really a problem, but perhaps > >> > >> noteworthy. > >> > >> >> >> > > >> > >> >> >> > Erik. > >> > >> >> >> > >> > >> >> >> ---Brett. > >> > >> >> >> > >> > >> >> >> ---------------------------------------------------------- > >> > >> >> >> --- > >> > >> >> >> -- > >> > >> >> >> --- > >> > >> >> >> --- > >> > >> >> >> ------ > >> > >> >> >> --- All of the data generated in your IT infrastructure is > >> > >> >> >> seriously valuable. Why? It contains a definitive record > >> > >> >> >> of application performance, security threats, fraudulent > >> > >> >> >> activity, and more. Splunk takes this data and makes sense > >> > >> >> >> of it. IT sense. And > >> > >> common sense. > >> > >> >> >> http://p.sf.net/sfu/splunk-d2d-c2 > >> > >> >> >> _______________________________________________ > >> > >> >> >> Rails-devel mailing list > >> > >> >> >> Rai...@li... > >> > >> >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> >> > > >> > >> >> > ----------------------------------------------------------- > >> > >> >> > --- > >> > >> >> > -- > >> > >> >> > --- > >> > >> >> > --- > >> > >> >> > -------- All of the data generated in your IT > >> > >> >> > infrastructure is seriously valuable. > >> > >> >> > Why? It contains a definitive record of application > >> > >> >> > performance, security threats, fraudulent activity, and more. > >> > >> >> > Splunk takes this data and makes sense of it. IT sense. And > >> common sense. > >> > >> >> > http://p.sf.net/sfu/splunk-d2d-c2 > >> > >> >> > _______________________________________________ > >> > >> >> > Rails-devel mailing list > >> > >> >> > Rai...@li... > >> > >> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> >> > > >> > >> >> > >> > >> >> > >> > >> > -------------------------------------------------------------- > >> > >> > --- > >> > >> > -- > >> > >> > --- > >> > >> > ------ > >> > >> > -- > >> > >> >> All of the data generated in your IT infrastructure is > >> > >> >> seriously > >> valuable. > >> > >> >> Why? It contains a definitive record of application > >> > >> >> performance, security threats, fraudulent activity, and more. > >> > >> >> Splunk takes this data and makes sense of it. IT sense. And > common sense. > >> > >> >> http://p.sf.net/sfu/splunk-d2d-c2 > >> > >> >> _______________________________________________ > >> > >> >> Rails-devel mailing list > >> > >> >> Rai...@li... > >> > >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> > > >> > >> > > >> > >> > -------------------------------------------------------------- > >> > >> > --- > >> > >> > -- > >> > >> > --- > >> > >> > -------- All of the data generated in your IT infrastructure > >> > >> > is seriously valuable. > >> > >> > Why? It contains a definitive record of application > >> > >> > performance, security threats, fraudulent activity, and more. > >> > >> > Splunk takes this data and makes sense of it. IT sense. And > common sense. > >> > >> > http://p.sf.net/sfu/splunk-d2d-c2 > >> > >> > _______________________________________________ > >> > >> > Rails-devel mailing list > >> > >> > Rai...@li... > >> > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> > > >> > >> > >> > >> ---------------------------------------------------------------- > >> > >> --- > >> > >> -- > >> > >> --------- All of the data generated in your IT infrastructure is > >> > >> seriously valuable. > >> > >> Why? It contains a definitive record of application performance, > >> > >> security threats, fraudulent activity, and more. Splunk takes > >> > >> this data and makes sense of it. IT sense. And common sense. > >> > >> http://p.sf.net/sfu/splunk-d2d-c2 > >> > >> _______________________________________________ > >> > >> Rails-devel mailing list > >> > >> Rai...@li... > >> > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > > >> > > > >> > > ----------------------------------------------------------------- > >> > > --- > >> > > -- > >> > > -------- All of the data generated in your IT infrastructure is > >> > > seriously valuable. > >> > > Why? It contains a definitive record of application performance, > >> > > security threats, fraudulent activity, and more. Splunk takes > >> > > this data and makes sense of it. IT sense. And common sense. > >> > > http://p.sf.net/sfu/splunk-d2d-c2 > >> > > _______________________________________________ > >> > > Rails-devel mailing list > >> > > Rai...@li... > >> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > > >> > > >> > ------------------------------------------------------------------- > >> > --- > >> > -------- AppSumo Presents a FREE Video for the SourceForge > >> > Community by Eric Ries, the creator of the Lean Startup Methodology > >> > on "Lean Startup Secrets Revealed." This video shows you how to > >> > validate your ideas, optimize your ideas and identify your business > strategy. > >> > http://p.sf.net/sfu/appsumosfdev2dev > >> > _______________________________________________ > >> > Rails-devel mailing list > >> > Rai...@li... > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> > >> > > ---------------------------------------------------------------------- > > ------ > > -- > >> AppSumo Presents a FREE Video for the SourceForge Community by Eric > >> Ries, the creator of the Lean Startup Methodology on "Lean Startup > >> Secrets Revealed." This video shows you how to validate your ideas, > >> optimize your ideas and identify your business strategy. > >> http://p.sf.net/sfu/appsumosfdev2dev > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > ---------------------------------------------------------------------- > > -------- > > Storage Efficiency Calculator > > This modeling tool is based on patent-pending intellectual property > > that has been used successfully in hundreds of IBM storage > > optimization engage- ments, worldwide. Store less, Store more with > > what you own, Move data to the right place. Try It Now! > > http://www.accelacomm.com/jaw/sfnl/114/51427378/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > Storage Efficiency Calculator > This modeling tool is based on patent-pending intellectual property that has > been used successfully in hundreds of IBM storage optimization engage- > ments, worldwide. Store less, Store more with what you own, Move data to > the right place. Try It Now! > http://www.accelacomm.com/jaw/sfnl/114/51427378/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-18 19:54:41
|
Yeah, that should be fine. ---Brett. On Mon, Jul 18, 2011 at 12:31 PM, Erik Vos <eri...@xs...> wrote: > I was having a classpath problem: the builder could not find some jars that > did not have "exported" status. > > <?xml version="1.0" encoding="UTF-8"?> > <classpath> > <classpathentry > excluding="lib/batik-1.7/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3.8.2/|l > ib/log4j-1.2/|lib/batik-1.7/lib/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3 > .8.2/|lib/log4j-1.2/|lib/batik-1.7/|lib/batik-1.7/lib/" kind="src" path=""/> > <classpathentry exported="true" kind="con" > path="org.eclipse.jdt.launching.JRE_CONTAINER"/> > <classpathentry kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> > <classpathentry kind="lib" > path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> > <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> > <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> > <classpathentry kind="lib" path="lib/batik-1.7/batik.jar"/> > <classpathentry kind="lib" > path="lib/batik-1.7/lib/batik-bridge.jar"/> > <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-dom.jar"/> > <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-ext.jar"/> > <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-gvt.jar"/> > <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-util.jar"/> > <classpathentry kind="output" path="classes"/> > </classpath> > > Adding exported="true" to all entries fixed that. > > I'm not sure what logic is behind this, but is it OK to commit this change? > > Erik. > > >> -----Original Message----- >> From: Erik Vos [mailto:eri...@xs...] >> Sent: Monday, July 18, 2011 11:11 AM >> To: 'Development list for Rails: an 18xx game' >> Subject: Re: [Rails-devel] Git repository is now available. >> >> OK, I have imported the new repository via Eclipse, and all seems well. >> Later this week I'll try to resume bug fixing and other useful work. >> >> Erik. >> >> > -----Original Message----- >> > From: brett lentz [mailto:bre...@gm...] >> > Sent: Sunday, July 17, 2011 9:20 PM >> > To: Development list for Rails: an 18xx game >> > Subject: [Rails-devel] Git repository is now available. >> > >> > I've migrated all of the commits up to r1614 from SVN into the Git >> > repository on SF.net. >> > >> > Currently, none of the tags have been migrated due to differences in >> > how SVN and Git handle tags. I'll be pushing the tags up as soon as I >> > have them ready. >> > >> > Important note for committers: >> > >> > Please set up your .gitconfig to include your name and e-mail address >> > for all future commits. >> > >> > During the migration, you'll note I've converted all existing commits >> > to use this information. To have the tree remain consistent, you'll >> > need to follow suit. >> > >> > ---Brett. >> > >> > >> > >> > On Mon, Jul 11, 2011 at 1:31 PM, Erik Vos <eri...@xs...> wrote: >> > > That would be great. Thanks. >> > > Erik. >> > > >> > >> -----Original Message----- >> > >> From: brett lentz [mailto:bre...@gm...] >> > >> Sent: Monday, July 11, 2011 9:45 PM >> > >> To: Development list for Rails: an 18xx game >> > >> Subject: Re: [Rails-devel] Are we ready for Git? >> > >> >> > >> I'll work on it this week. This coming weekend should be a good >> > >> target for the cutover. >> > >> >> > >> ---Brett. >> > >> >> > >> >> > >> >> > >> On Mon, Jul 11, 2011 at 12:32 PM, Erik Vos <eri...@xs...> > wrote: >> > >> > OK, it seems we are ready then for the switchover. >> > >> > >> > >> > Brett, when do you think you can have rebuilt the Git repo at >> > Sourceforge? >> > >> > I suppose it's better to create a fresh new repository than to do >> > >> > a massive update to get the current old one up to date. >> > >> > >> > >> > Erik. >> > >> > >> > >> >> -----Original Message----- >> > >> >> From: Phil Davies [mailto:de...@gm...] >> > >> >> Sent: Monday, July 11, 2011 10:56 AM >> > >> >> To: Development list for Rails: an 18xx game >> > >> >> Subject: Re: [Rails-devel] Are we ready for Git? >> > >> >> >> > >> >> As far as I'm concerned it's really Brett, Erik and Stefan's >> > >> >> decision >> > >> > being the >> > >> >> primary contributors to the project. IntelliJ has a Git plugin >> > >> >> so I'm >> > >> > sure I'll >> > >> >> work it out :) >> > >> >> >> > >> >> Phil >> > >> >> >> > >> >> On 11 July 2011 06:04, Stefan Frey <ste...@we...> wrote: >> > >> >> > Erik & Brett, >> > >> >> > given that you both had some long-time hands-on-experience >> > >> >> > with Maven (compared to my third-party recommendation and a >> > >> >> > short >> > >> >> > try-out) I agree to stay with the current setup. >> > >> >> > I had not tested EGit/JGit before, thus I considered them as >> > >> >> > competing products similar to the svn-support in eclipse ;-) >> > >> >> > Stefan >> > >> >> > >> > >> >> > On Sunday, July 10, 2011 07:08:05 pm brett lentz wrote: >> > >> >> >> On Sun, Jul 10, 2011 at 9:24 AM, Erik Vos >> > >> >> >> <eri...@xs...> >> > wrote: >> > >> >> >> >> -----Original Message----- >> > >> >> >> >> From: Stefan Frey [mailto:ste...@we...] >> > >> >> >> >> Sent: Sunday, July 10, 2011 2:42 PM >> > >> >> >> >> To: Development list for Rails: an 18xx game >> > >> >> >> >> Subject: Re: [Rails-devel] Are we ready for Git? >> > >> >> >> >> >> > >> >> >> >> Erik & Brett, >> > >> >> >> >> I am up for that move. Do you recommend JGit or Egit? >> > >> >> >> > >> > >> >> >> > AFAIK you need both (in Eclipse). >> > >> >> >> >> > >> >> >> Correct. >> > >> >> >> >> > >> >> >> JGit is the java git implementation. >> > >> >> >> EGit is the eclipse plugin built on top of JGit. >> > >> >> >> >> > >> >> >> >> I am wondering if you would consider to move to a maven >> > >> >> >> >> build at the same time. Ideally by changing to the maven >> > >> >> >> >> recommended repo >> > >> >> layout. >> > >> >> >> > >> > >> >> >> > Dunno. Brett is handling the builds (I only run either from >> > >> >> >> > Eclipse Run or from the published Rails jars). >> > >> >> >> > >> > >> >> >> > I hardly know anything about Maven. In the past I have been >> > >> >> >> > half-involved with some (old) projects that used Maven, and >> > >> >> >> > perhaps >> > >> >> some other stuff. >> > >> >> >> > What I remember about these projects was the ubiquitous >> > >> >> >> > presence of pom.xml files that did not mean anything to me >> > >> >> >> > (I wasn't really interested either - it worked). So I'm > blank. >> > >> >> >> >> > >> >> >> I deal with Maven at my day job, and I'm not a fan. Perhaps >> > >> >> >> as Maven >> > >> >> >> 3 matures, it will improve in crucial areas. Right now, I >> > >> >> >> really dislike the way it handles dependency resolution, >> > >> >> >> among >> > other things. >> > >> >> >> >> > >> >> >> > Perhaps we'll better restrict ourselves to one major step >> > >> >> >> > at a >> > time? >> > >> >> >> >> > >> >> >> Agreed. >> > >> >> >> >> > >> >> >> > One thing on our Git repo that I have struggled with >> > >> >> >> > yesterday is that it seems to require that the .git >> > >> >> >> > directory would exist at the same level as all project >> > >> >> >> > directories (game, tile, data etc.). I was trying to get >> > >> >> >> > these directories below a src directory on the same level >> > >> >> >> > as .git (under the project root), but failed to get there. >> > >> >> >> > Not really a problem, but perhaps >> > >> noteworthy. >> > >> >> >> > >> > >> >> >> > Erik. >> > >> >> >> >> > >> >> >> ---Brett. >> > >> >> >> >> > >> >> >> ------------------------------------------------------------- >> > >> >> >> -- >> > >> >> >> --- >> > >> >> >> --- >> > >> >> >> ------ >> > >> >> >> --- All of the data generated in your IT infrastructure is >> > >> >> >> seriously valuable. Why? It contains a definitive record of >> > >> >> >> application performance, security threats, fraudulent >> > >> >> >> activity, and more. Splunk takes this data and makes sense of >> > >> >> >> it. IT sense. And >> > >> common sense. >> > >> >> >> http://p.sf.net/sfu/splunk-d2d-c2 >> > >> >> >> _______________________________________________ >> > >> >> >> Rails-devel mailing list >> > >> >> >> Rai...@li... >> > >> >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> >> > >> > >> >> > -------------------------------------------------------------- >> > >> >> > -- >> > >> >> > --- >> > >> >> > --- >> > >> >> > -------- All of the data generated in your IT infrastructure >> > >> >> > is seriously valuable. >> > >> >> > Why? It contains a definitive record of application >> > >> >> > performance, security threats, fraudulent activity, and more. >> > >> >> > Splunk takes this data and makes sense of it. IT sense. And >> common sense. >> > >> >> > http://p.sf.net/sfu/splunk-d2d-c2 >> > >> >> > _______________________________________________ >> > >> >> > Rails-devel mailing list >> > >> >> > Rai...@li... >> > >> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> >> > >> > >> >> >> > >> >> >> > >> > ----------------------------------------------------------------- >> > >> > -- >> > >> > --- >> > >> > ------ >> > >> > -- >> > >> >> All of the data generated in your IT infrastructure is seriously >> valuable. >> > >> >> Why? It contains a definitive record of application performance, >> > >> >> security threats, fraudulent activity, and more. Splunk takes >> > >> >> this data and makes sense of it. IT sense. And common sense. >> > >> >> http://p.sf.net/sfu/splunk-d2d-c2 >> > >> >> _______________________________________________ >> > >> >> Rails-devel mailing list >> > >> >> Rai...@li... >> > >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > >> > >> > >> > >> > ----------------------------------------------------------------- >> > >> > -- >> > >> > --- >> > >> > -------- All of the data generated in your IT infrastructure is >> > >> > seriously valuable. >> > >> > Why? It contains a definitive record of application performance, >> > >> > security threats, fraudulent activity, and more. Splunk takes >> > >> > this data and makes sense of it. IT sense. And common sense. >> > >> > http://p.sf.net/sfu/splunk-d2d-c2 >> > >> > _______________________________________________ >> > >> > Rails-devel mailing list >> > >> > Rai...@li... >> > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > >> > >> >> > >> ------------------------------------------------------------------- >> > >> -- >> > >> --------- All of the data generated in your IT infrastructure is >> > >> seriously valuable. >> > >> Why? It contains a definitive record of application performance, >> > >> security threats, fraudulent activity, and more. Splunk takes this >> > >> data and makes sense of it. IT sense. And common sense. >> > >> http://p.sf.net/sfu/splunk-d2d-c2 >> > >> _______________________________________________ >> > >> Rails-devel mailing list >> > >> Rai...@li... >> > >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > > >> > > >> > > -------------------------------------------------------------------- >> > > -- >> > > -------- All of the data generated in your IT infrastructure is >> > > seriously valuable. >> > > Why? It contains a definitive record of application performance, >> > > security threats, fraudulent activity, and more. Splunk takes this >> > > data and makes sense of it. IT sense. And common sense. >> > > http://p.sf.net/sfu/splunk-d2d-c2 >> > > _______________________________________________ >> > > Rails-devel mailing list >> > > Rai...@li... >> > > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > > >> > >> > ---------------------------------------------------------------------- >> > -------- AppSumo Presents a FREE Video for the SourceForge Community >> > by Eric Ries, the creator of the Lean Startup Methodology on "Lean >> > Startup Secrets Revealed." This video shows you how to validate your >> > ideas, optimize your ideas and identify your business strategy. >> > http://p.sf.net/sfu/appsumosfdev2dev >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> >> > ---------------------------------------------------------------------------- > -- >> AppSumo Presents a FREE Video for the SourceForge Community by Eric >> Ries, the creator of the Lean Startup Methodology on "Lean Startup Secrets >> Revealed." This video shows you how to validate your ideas, optimize your >> ideas and identify your business strategy. >> http://p.sf.net/sfu/appsumosfdev2dev >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > ------------------------------------------------------------------------------ > Storage Efficiency Calculator > This modeling tool is based on patent-pending intellectual property that > has been used successfully in hundreds of IBM storage optimization engage- > ments, worldwide. Store less, Store more with what you own, Move data to > the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Erik V. <eri...@xs...> - 2011-07-18 19:31:18
|
I was having a classpath problem: the builder could not find some jars that did not have "exported" status. <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="lib/batik-1.7/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3.8.2/|l ib/log4j-1.2/|lib/batik-1.7/lib/|lib/jgraph5/|lib/jgrapht-0.7.3/|lib/junit_3 .8.2/|lib/log4j-1.2/|lib/batik-1.7/|lib/batik-1.7/lib/" kind="src" path=""/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/log4j-1.2/log4j-1.2.14.jar"/> <classpathentry kind="lib" path="lib/jgrapht-0.7.3/jgrapht-jdk1.5.jar"/> <classpathentry kind="lib" path="lib/junit_3.8.2/junit.jar"/> <classpathentry kind="lib" path="lib/jgraph5/jgraph.jar"/> <classpathentry kind="lib" path="lib/batik-1.7/batik.jar"/> <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-bridge.jar"/> <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-dom.jar"/> <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-ext.jar"/> <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-gvt.jar"/> <classpathentry kind="lib" path="lib/batik-1.7/lib/batik-util.jar"/> <classpathentry kind="output" path="classes"/> </classpath> Adding exported="true" to all entries fixed that. I'm not sure what logic is behind this, but is it OK to commit this change? Erik. > -----Original Message----- > From: Erik Vos [mailto:eri...@xs...] > Sent: Monday, July 18, 2011 11:11 AM > To: 'Development list for Rails: an 18xx game' > Subject: Re: [Rails-devel] Git repository is now available. > > OK, I have imported the new repository via Eclipse, and all seems well. > Later this week I'll try to resume bug fixing and other useful work. > > Erik. > > > -----Original Message----- > > From: brett lentz [mailto:bre...@gm...] > > Sent: Sunday, July 17, 2011 9:20 PM > > To: Development list for Rails: an 18xx game > > Subject: [Rails-devel] Git repository is now available. > > > > I've migrated all of the commits up to r1614 from SVN into the Git > > repository on SF.net. > > > > Currently, none of the tags have been migrated due to differences in > > how SVN and Git handle tags. I'll be pushing the tags up as soon as I > > have them ready. > > > > Important note for committers: > > > > Please set up your .gitconfig to include your name and e-mail address > > for all future commits. > > > > During the migration, you'll note I've converted all existing commits > > to use this information. To have the tree remain consistent, you'll > > need to follow suit. > > > > ---Brett. > > > > > > > > On Mon, Jul 11, 2011 at 1:31 PM, Erik Vos <eri...@xs...> wrote: > > > That would be great. Thanks. > > > Erik. > > > > > >> -----Original Message----- > > >> From: brett lentz [mailto:bre...@gm...] > > >> Sent: Monday, July 11, 2011 9:45 PM > > >> To: Development list for Rails: an 18xx game > > >> Subject: Re: [Rails-devel] Are we ready for Git? > > >> > > >> I'll work on it this week. This coming weekend should be a good > > >> target for the cutover. > > >> > > >> ---Brett. > > >> > > >> > > >> > > >> On Mon, Jul 11, 2011 at 12:32 PM, Erik Vos <eri...@xs...> wrote: > > >> > OK, it seems we are ready then for the switchover. > > >> > > > >> > Brett, when do you think you can have rebuilt the Git repo at > > Sourceforge? > > >> > I suppose it's better to create a fresh new repository than to do > > >> > a massive update to get the current old one up to date. > > >> > > > >> > Erik. > > >> > > > >> >> -----Original Message----- > > >> >> From: Phil Davies [mailto:de...@gm...] > > >> >> Sent: Monday, July 11, 2011 10:56 AM > > >> >> To: Development list for Rails: an 18xx game > > >> >> Subject: Re: [Rails-devel] Are we ready for Git? > > >> >> > > >> >> As far as I'm concerned it's really Brett, Erik and Stefan's > > >> >> decision > > >> > being the > > >> >> primary contributors to the project. IntelliJ has a Git plugin > > >> >> so I'm > > >> > sure I'll > > >> >> work it out :) > > >> >> > > >> >> Phil > > >> >> > > >> >> On 11 July 2011 06:04, Stefan Frey <ste...@we...> wrote: > > >> >> > Erik & Brett, > > >> >> > given that you both had some long-time hands-on-experience > > >> >> > with Maven (compared to my third-party recommendation and a > > >> >> > short > > >> >> > try-out) I agree to stay with the current setup. > > >> >> > I had not tested EGit/JGit before, thus I considered them as > > >> >> > competing products similar to the svn-support in eclipse ;-) > > >> >> > Stefan > > >> >> > > > >> >> > On Sunday, July 10, 2011 07:08:05 pm brett lentz wrote: > > >> >> >> On Sun, Jul 10, 2011 at 9:24 AM, Erik Vos > > >> >> >> <eri...@xs...> > > wrote: > > >> >> >> >> -----Original Message----- > > >> >> >> >> From: Stefan Frey [mailto:ste...@we...] > > >> >> >> >> Sent: Sunday, July 10, 2011 2:42 PM > > >> >> >> >> To: Development list for Rails: an 18xx game > > >> >> >> >> Subject: Re: [Rails-devel] Are we ready for Git? > > >> >> >> >> > > >> >> >> >> Erik & Brett, > > >> >> >> >> I am up for that move. Do you recommend JGit or Egit? > > >> >> >> > > > >> >> >> > AFAIK you need both (in Eclipse). > > >> >> >> > > >> >> >> Correct. > > >> >> >> > > >> >> >> JGit is the java git implementation. > > >> >> >> EGit is the eclipse plugin built on top of JGit. > > >> >> >> > > >> >> >> >> I am wondering if you would consider to move to a maven > > >> >> >> >> build at the same time. Ideally by changing to the maven > > >> >> >> >> recommended repo > > >> >> layout. > > >> >> >> > > > >> >> >> > Dunno. Brett is handling the builds (I only run either from > > >> >> >> > Eclipse Run or from the published Rails jars). > > >> >> >> > > > >> >> >> > I hardly know anything about Maven. In the past I have been > > >> >> >> > half-involved with some (old) projects that used Maven, and > > >> >> >> > perhaps > > >> >> some other stuff. > > >> >> >> > What I remember about these projects was the ubiquitous > > >> >> >> > presence of pom.xml files that did not mean anything to me > > >> >> >> > (I wasn't really interested either - it worked). So I'm blank. > > >> >> >> > > >> >> >> I deal with Maven at my day job, and I'm not a fan. Perhaps > > >> >> >> as Maven > > >> >> >> 3 matures, it will improve in crucial areas. Right now, I > > >> >> >> really dislike the way it handles dependency resolution, > > >> >> >> among > > other things. > > >> >> >> > > >> >> >> > Perhaps we'll better restrict ourselves to one major step > > >> >> >> > at a > > time? > > >> >> >> > > >> >> >> Agreed. > > >> >> >> > > >> >> >> > One thing on our Git repo that I have struggled with > > >> >> >> > yesterday is that it seems to require that the .git > > >> >> >> > directory would exist at the same level as all project > > >> >> >> > directories (game, tile, data etc.). I was trying to get > > >> >> >> > these directories below a src directory on the same level > > >> >> >> > as .git (under the project root), but failed to get there. > > >> >> >> > Not really a problem, but perhaps > > >> noteworthy. > > >> >> >> > > > >> >> >> > Erik. > > >> >> >> > > >> >> >> ---Brett. > > >> >> >> > > >> >> >> ------------------------------------------------------------- > > >> >> >> -- > > >> >> >> --- > > >> >> >> --- > > >> >> >> ------ > > >> >> >> --- All of the data generated in your IT infrastructure is > > >> >> >> seriously valuable. Why? It contains a definitive record of > > >> >> >> application performance, security threats, fraudulent > > >> >> >> activity, and more. Splunk takes this data and makes sense of > > >> >> >> it. IT sense. And > > >> common sense. > > >> >> >> http://p.sf.net/sfu/splunk-d2d-c2 > > >> >> >> _______________________________________________ > > >> >> >> Rails-devel mailing list > > >> >> >> Rai...@li... > > >> >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > >> >> > > > >> >> > -------------------------------------------------------------- > > >> >> > -- > > >> >> > --- > > >> >> > --- > > >> >> > -------- All of the data generated in your IT infrastructure > > >> >> > is seriously valuable. > > >> >> > Why? It contains a definitive record of application > > >> >> > performance, security threats, fraudulent activity, and more. > > >> >> > Splunk takes this data and makes sense of it. IT sense. And > common sense. > > >> >> > http://p.sf.net/sfu/splunk-d2d-c2 > > >> >> > _______________________________________________ > > >> >> > Rails-devel mailing list > > >> >> > Rai...@li... > > >> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > >> >> > > > >> >> > > >> >> > > >> > ----------------------------------------------------------------- > > >> > -- > > >> > --- > > >> > ------ > > >> > -- > > >> >> All of the data generated in your IT infrastructure is seriously > valuable. > > >> >> Why? It contains a definitive record of application performance, > > >> >> security threats, fraudulent activity, and more. Splunk takes > > >> >> this data and makes sense of it. IT sense. And common sense. > > >> >> http://p.sf.net/sfu/splunk-d2d-c2 > > >> >> _______________________________________________ > > >> >> Rails-devel mailing list > > >> >> Rai...@li... > > >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > >> > > > >> > > > >> > ----------------------------------------------------------------- > > >> > -- > > >> > --- > > >> > -------- All of the data generated in your IT infrastructure is > > >> > seriously valuable. > > >> > Why? It contains a definitive record of application performance, > > >> > security threats, fraudulent activity, and more. Splunk takes > > >> > this data and makes sense of it. IT sense. And common sense. > > >> > http://p.sf.net/sfu/splunk-d2d-c2 > > >> > _______________________________________________ > > >> > Rails-devel mailing list > > >> > Rai...@li... > > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > >> > > > >> > > >> ------------------------------------------------------------------- > > >> -- > > >> --------- All of the data generated in your IT infrastructure is > > >> seriously valuable. > > >> Why? It contains a definitive record of application performance, > > >> security threats, fraudulent activity, and more. Splunk takes this > > >> data and makes sense of it. IT sense. And common sense. > > >> http://p.sf.net/sfu/splunk-d2d-c2 > > >> _______________________________________________ > > >> Rails-devel mailing list > > >> Rai...@li... > > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > -------------------------------------------------------------------- > > > -- > > > -------- All of the data generated in your IT infrastructure is > > > seriously valuable. > > > Why? It contains a definitive record of application performance, > > > security threats, fraudulent activity, and more. Splunk takes this > > > data and makes sense of it. IT sense. And common sense. > > > http://p.sf.net/sfu/splunk-d2d-c2 > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > ---------------------------------------------------------------------- > > -------- AppSumo Presents a FREE Video for the SourceForge Community > > by Eric Ries, the creator of the Lean Startup Methodology on "Lean > > Startup Secrets Revealed." This video shows you how to validate your > > ideas, optimize your ideas and identify your business strategy. > > http://p.sf.net/sfu/appsumosfdev2dev > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > ---------------------------------------------------------------------------- -- > AppSumo Presents a FREE Video for the SourceForge Community by Eric > Ries, the creator of the Lean Startup Methodology on "Lean Startup Secrets > Revealed." This video shows you how to validate your ideas, optimize your > ideas and identify your business strategy. > http://p.sf.net/sfu/appsumosfdev2dev > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
From: brett l. <bre...@gm...> - 2011-07-18 19:03:32
|
Hrm... I'd swear I moved that call into the new constructor. It was working when I last tested it. I'll check it out and see what went wrong. ---Brett. On Mon, Jul 18, 2011 at 11:50 AM, Erik Vos <eri...@xs...> wrote: > Brett, > > I think this is caused by your refactoring of game info parsing. > GameInfo.setNote() is no longer called, so all notes stay at the default > value "Notes". You seem to have overlooked <Note> in your new parser. > > Erik. > >> -----Original Message----- >> From: Phil Davies [mailto:de...@gm...] >> Sent: Monday, July 18, 2011 1:51 PM >> To: Development list for Rails: an 18xx game >> Subject: Re: [Rails-devel] Git repository is now available. >> >> Something strange in the version checked out from Git. On the available >> games dialogue at startup, each game just ahs the word 'Notes' next to it, >> rather than the previous designation of 'playable, unplayable' etc. >> > > > ------------------------------------------------------------------------------ > Storage Efficiency Calculator > This modeling tool is based on patent-pending intellectual property that > has been used successfully in hundreds of IBM storage optimization engage- > ments, worldwide. Store less, Store more with what you own, Move data to > the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Erik V. <eri...@xs...> - 2011-07-18 18:50:39
|
Brett, I think this is caused by your refactoring of game info parsing. GameInfo.setNote() is no longer called, so all notes stay at the default value "Notes". You seem to have overlooked <Note> in your new parser. Erik. > -----Original Message----- > From: Phil Davies [mailto:de...@gm...] > Sent: Monday, July 18, 2011 1:51 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Git repository is now available. > > Something strange in the version checked out from Git. On the available > games dialogue at startup, each game just ahs the word 'Notes' next to it, > rather than the previous designation of 'playable, unplayable' etc. > |