Menu
▾
▴
rails-devel — List for discussion of Rails development
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: brett l. <bre...@gm...> - 2011-07-21 22:48:08
|
That makes more sense from a historical perspective.
My thinking is that two back-to-back if-statements that are checking
the same condition is redundant and unnecessary. You've checked the
condition once and have a code block for it. There's no need to do the
exact same check again immediately afterward. The same backward
compatibility can be achieved with a comment block that identifies
which portions are for legacy functions and which portions are for
current functions.
But... that's sort of tangential and I'm not invested in being right.
We can revert it if needs be.
Ok... so, can you check if we even need the backwards compatible
portion anymore? I'd rather just drop that stuff to reduce the overall
complexity. If it's still needed, great, I'll revert my change.
---Brett.
On Thu, Jul 21, 2011 at 3:37 PM, Erik Vos <eri...@xs...> wrote:
> As the comment in the code says: the first 'if' is there for backwards compatibility.
> I don't remember the exact point of it, and most likely it's obsolete by now. I'll have to investigate that; I guess I had somehow fiddled with option names.
> (What that code does is look for an option with a longer name than the one at hand. )
>
> But either that first 'if' must be completely removed, or it must be retained as is. Your 'fix' makes no sense. Read the code.
> (The danger of removing it is that some of my old saved files may no longer work).
>
> Erik.
>
>> -----Original Message-----
>> From: brett lentz [mailto:bre...@gm...]
>> Sent: Thursday, July 21, 2011 10:28 PM
>> To: Development list for Rails: an 18xx game
>> Subject: Re: [Rails-devel] [Rails-commits] rails/common
>>
>> Really?
>>
>> My initial reaction is that it sounds like a design flaw if the XML properties can
>> change in the span of 3 lines, especially given that our current init code isn't
>> multi-threaded.
>>
>> Can you identify a case where this actually happens (and is a good thing)?
>>
>> ---Brett.
>>
>>
>>
>> On Thu, Jul 21, 2011 at 12:52 PM, Erik Vos <eri...@xs...> wrote:
>> > Brett,
>> >
>> > I don't think this is a good change, because 'optionValue' may have
>> > been assigned between the first and the second identical ifs.
>> > This second if [ if (optionValue == null) ] should be read as: if
>> > optionValue is *still* null, then...
>> >
>> > Erik.
>> >
>> >> -----Original Message-----
>> >> From: Brett Lentz [mailto:wak...@us...]
>> >> Sent: Thursday, July 21, 2011 7:02 PM
>> >> To: rai...@li...
>> >> Subject: [Rails-commits] rails/common
>> >>
>> >> rails/common/parser/Tag.java | 3 ---
>> >> 1 file changed, 3 deletions(-)
>> >>
>> >> New commits:
>> >> commit 6b7255acdcdfd3217884ae2701975166df7350b8
>> >> Author: Brett Lentz <bl...@cl...>
>> >> Date: Thu Jul 21 09:58:42 2011 -0700
>> >>
>> >> Tag: simplify conditional logic.
>> >>
>> >> This is really a spurious commit to test Egit.
>> >>
>> >> diff --git a/rails/common/parser/Tag.java
>> >> b/rails/common/parser/Tag.java index 22c3c0a..7a7d46e 100644
>> >> --- a/rails/common/parser/Tag.java
>> >> +++ b/rails/common/parser/Tag.java
>> >> @@ -326,9 +326,6 @@ public class Tag {
>> >> break;
>> >> }
>> >> }
>> >> - }
>> >> -
>> >> - if (optionValue == null) {
>> >> // Take the default value
>> >> GameOption go = GameOption.getByName(name);
>> >> optionValue = go != null ? go.getDefaultValue() :
>> > "";
>> >>
>> >>
>> >>
>> >>
>> > ----------------------------------------------------------------------
>> > ------
>> > --
>> >> 5 Ways to Improve & Secure Unified Communications Unified
>> >> Communications promises greater efficiencies for business. UC can
>> >> improve internal communications as well as offer faster, more
>> >> efficient ways to interact with customers and streamline customer
>> service. Learn more!
>> >> http://www.accelacomm.com/jaw/sfnl/114/51426253/
>> >> _______________________________________________
>> >> Rails-commits mailing list
>> >> Rai...@li...
>> >> https://lists.sourceforge.net/lists/listinfo/rails-commits
>> >
>> >
>> > ----------------------------------------------------------------------
>> > --------
>> > 5 Ways to Improve & Secure Unified Communications Unified
>> > Communications promises greater efficiencies for business. UC can
>> > improve internal communications as well as offer faster, more
>> > efficient ways to interact with customers and streamline customer service.
>> Learn more!
>> > http://www.accelacomm.com/jaw/sfnl/114/51426253/
>> > _______________________________________________
>> > Rails-devel mailing list
>> > Rai...@li...
>> > https://lists.sourceforge.net/lists/listinfo/rails-devel
>> >
>>
>> ------------------------------------------------------------------------------
>> 5 Ways to Improve & Secure Unified Communications Unified
>> Communications promises greater efficiencies for business. UC can improve
>> internal communications as well as offer faster, more efficient ways to
>> interact with customers and streamline customer service. Learn more!
>> http://www.accelacomm.com/jaw/sfnl/114/51426253/
>> _______________________________________________
>> Rails-devel mailing list
>> Rai...@li...
>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
>
> ------------------------------------------------------------------------------
> 5 Ways to Improve & Secure Unified Communications
> Unified Communications promises greater efficiencies for business. UC can
> improve internal communications as well as offer faster, more efficient ways
> to interact with customers and streamline customer service. Learn more!
> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
|
|
From: Erik V. <eri...@xs...> - 2011-07-21 22:38:35
|
It seems to me that Egit is not yet mature in all respects. For instance, the errors I have got are much better explained on the command line than they are in Egit. But we'll have to live with it. Do you have an example of how to configure --rebase in .gitconfig? Erik. > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Thursday, July 21, 2011 9:28 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Git troubleshooting > > On Thu, Jul 21, 2011 at 11:41 AM, Stefan Frey <ste...@we...> wrote: > > Brett, > > thanks for your support. Some comments below. > > > > I have used subversion for several years now (I switched to svn as > > soon as it worked somehow). > > > > My experience with subversion was that if you do not follow the > > recommended workflow from the beginning you are in a mess (e.g. not > > setting up the repo with trunk/branch/tag, avoid berkleyDB ...). > > > > Git is a *very* different tool, written to *very* different requirements. > > SVN is "CVS done right", ignoring the fact that the CVS design is > fundamentally flawed and using a development methodology from the 1980s > (the initial release of Gnu RCS was in 1982, and CVS is the successor to RCS). > Whereas Git is "Let's make a brand new VCS that can handle the current > linux-kernel development model." Git is solving today's problems where > SVN is (re-)solving 20-30 year old problems. > > I've had numerous problems over the years with corrupt SVN DBs; or > somebody using the wrong version of the SVN client and the stupid server > auto-upgrades the central SVN repo's DB, which makes all other clients > incompatible and causes much breakage. There are many design decisions > that SVN made that, IMO, are seriously flawed. > > One of the things Git does right, IMO, is that it doesn't complicate things with > crap like using a DB. Everything in the .git directory is a file. Your changes are > stored as plain-text diffs. For performance, Git gzips the files and repacks > them, but they're all accessible for viewing if you care to look. > > I have a suspicion that this is the reason that I can muck with Git outside of > Eclipse and have EGit "just work". It doesn't have to interface with a DB. It > just looks at the state of the filesystem and can see updates and just > automatically refresh the view inside Eclipse. As I've seen Linus post a few > different times, "Git is a stupid content tracker." It's stupid, which makes it > very smart. ;-) > > > On Thursday, July 21, 2011 07:59:43 pm brett lentz wrote: > >> Ok... I've made a few small commits with EGit, and I think I'm > >> getting the hang of the interface. It's a bit clumsy, but it seems to > >> do everything I expect. The EGit user guide is a fairly lengthy > >> document, but as Stefan noted earlier, it's got a lot of important > >> details that will help you learn the interface: > >> http://wiki.eclipse.org/EGit/User_Guide > > > > The main issue I have with the document is that if you are potential > > user of git most likely you do not need snapshots of each dialog, but > > better explanations and FAQs. > > > > It is like the assumption of Microsoft (in the beginning) that admins > > would prefer day-by-day work using a GUI. > > > > Agreed. The screenshots aren't super-helpful and a few are even outdated. > > But, that's the way they chose to write their docs. > > >> > >> Next... > >> > >> Also, in your git configs (usually a .gitconfig file in your home > >> directory), it's very handy to default to always rebasing incoming > >> changes. Merge commits are supposed to be meaningful, but the default > >> behavior is to always merge incoming changes (and create a merge > >> commit for them). The tradeoff here is that rebasing changes the > >> commit history, which is potentially dangerous and less obvious than > >> adding a bunch of extraneous merge commits every time you do a pull. > > > > Now you lost me: First you suggest to always rebase incoming changings > > and then you claim that it is potentially dangerous. Why should I > > choose such an option? > > Rebasing is changing the ordering of the commit history. It's an incredibly > important and powerful feature, but changing history is one of those topics > that's traditionally very scary to users. And, yes, I've seen a number of > "OMG! Rebasing ate my baby!" blog posts from users who have misused or > misunderstood the feature. > > It's the one feature that trips people up the most because it's a completely > foreign concept if you're coming from CVS/SVN. > > My point was, it's not the default behavior for good reason. However, for the > simple "git pull" operation, it tends to be the best option (once you > understand how it works) because it keeps the commit history cleaner and > separates the "update from upstream" and "merge your local work" steps > into two discrete actions. This separation makes it more clear when the > rebase of upstream changes causes a merge conflict and when your local > changes are causing the merge conflict. > > This is one of those areas in which; unlike CVS/SVN, where you can get away > with not caring about the tool's internals; it is very helpful to have some > knowledge of _how_ Git works because it helps you do more advanced > things with the repository. > > > > > More seriously: > > This is set in the branching dialog for each branch. Given the > > documentation egit should use the default from .gitconfig for new > > branches, the egit default is merging. > > > > http://wiki.eclipse.org/EGit/User_Guide#Branching > > > > The connection is then set for the tracking relationship (rebase or > > merge on > > pull) and it seems that this cannot be changed via UI (maybe by > > setting a property in the git explorer view). > > > > see here > > > http://wiki.eclipse.org/EGit/User_Guide#Pulling_New_Changes_from_Upst > r > > eam_Branch > > > > And the link above has a critical reminder for Windows user: > > There is an existing bug such that WIndows users should avoid "git > > pull" on the command line if using egit. > > > > Yep. We're going to need to learn platform-specific issues with the new tool. > My main machines are running Linux or Mac OS X. I've got an old Windows > machine I use occasionally, but not often. > > > Hope it will soon all be sorted out. > > Yes. Unfortunately, this is one of the down sides to EGit. For better or worse, > they decided to use a complete re-implementation of Git in Java (JGit) > instead of just hooking into the pre-existing tools and libraries. It's not the > choice I'd have made, but that's what they went with. I'm certain it'll get > better over time. Judging by the mailing list, the project is under active > development, so we should see fixes relatively soon. The project has already > come a long way in the last year (when we opted for CVS->SVN instead of > CVS->Git) and I'm confident these issues will be sorted relatively soon. > > > Stefan > > > > ---Brett. > > ---------------------------------------------------------------------------- -- > 5 Ways to Improve & Secure Unified Communications Unified > Communications promises greater efficiencies for business. UC can improve > internal communications as well as offer faster, more efficient ways to > interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: Erik V. <eri...@xs...> - 2011-07-21 22:37:16
|
As the comment in the code says: the first 'if' is there for backwards compatibility.
I don't remember the exact point of it, and most likely it's obsolete by now. I'll have to investigate that; I guess I had somehow fiddled with option names.
(What that code does is look for an option with a longer name than the one at hand. )
But either that first 'if' must be completely removed, or it must be retained as is. Your 'fix' makes no sense. Read the code.
(The danger of removing it is that some of my old saved files may no longer work).
Erik.
> -----Original Message-----
> From: brett lentz [mailto:bre...@gm...]
> Sent: Thursday, July 21, 2011 10:28 PM
> To: Development list for Rails: an 18xx game
> Subject: Re: [Rails-devel] [Rails-commits] rails/common
>
> Really?
>
> My initial reaction is that it sounds like a design flaw if the XML properties can
> change in the span of 3 lines, especially given that our current init code isn't
> multi-threaded.
>
> Can you identify a case where this actually happens (and is a good thing)?
>
> ---Brett.
>
>
>
> On Thu, Jul 21, 2011 at 12:52 PM, Erik Vos <eri...@xs...> wrote:
> > Brett,
> >
> > I don't think this is a good change, because 'optionValue' may have
> > been assigned between the first and the second identical ifs.
> > This second if [ if (optionValue == null) ] should be read as: if
> > optionValue is *still* null, then...
> >
> > Erik.
> >
> >> -----Original Message-----
> >> From: Brett Lentz [mailto:wak...@us...]
> >> Sent: Thursday, July 21, 2011 7:02 PM
> >> To: rai...@li...
> >> Subject: [Rails-commits] rails/common
> >>
> >> rails/common/parser/Tag.java | 3 ---
> >> 1 file changed, 3 deletions(-)
> >>
> >> New commits:
> >> commit 6b7255acdcdfd3217884ae2701975166df7350b8
> >> Author: Brett Lentz <bl...@cl...>
> >> Date: Thu Jul 21 09:58:42 2011 -0700
> >>
> >> Tag: simplify conditional logic.
> >>
> >> This is really a spurious commit to test Egit.
> >>
> >> diff --git a/rails/common/parser/Tag.java
> >> b/rails/common/parser/Tag.java index 22c3c0a..7a7d46e 100644
> >> --- a/rails/common/parser/Tag.java
> >> +++ b/rails/common/parser/Tag.java
> >> @@ -326,9 +326,6 @@ public class Tag {
> >> break;
> >> }
> >> }
> >> - }
> >> -
> >> - if (optionValue == null) {
> >> // Take the default value
> >> GameOption go = GameOption.getByName(name);
> >> optionValue = go != null ? go.getDefaultValue() :
> > "";
> >>
> >>
> >>
> >>
> > ----------------------------------------------------------------------
> > ------
> > --
> >> 5 Ways to Improve & Secure Unified Communications Unified
> >> Communications promises greater efficiencies for business. UC can
> >> improve internal communications as well as offer faster, more
> >> efficient ways to interact with customers and streamline customer
> service. Learn more!
> >> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> >> _______________________________________________
> >> Rails-commits mailing list
> >> Rai...@li...
> >> https://lists.sourceforge.net/lists/listinfo/rails-commits
> >
> >
> > ----------------------------------------------------------------------
> > --------
> > 5 Ways to Improve & Secure Unified Communications Unified
> > Communications promises greater efficiencies for business. UC can
> > improve internal communications as well as offer faster, more
> > efficient ways to interact with customers and streamline customer service.
> Learn more!
> > http://www.accelacomm.com/jaw/sfnl/114/51426253/
> > _______________________________________________
> > Rails-devel mailing list
> > Rai...@li...
> > https://lists.sourceforge.net/lists/listinfo/rails-devel
> >
>
> ------------------------------------------------------------------------------
> 5 Ways to Improve & Secure Unified Communications Unified
> Communications promises greater efficiencies for business. UC can improve
> internal communications as well as offer faster, more efficient ways to
> interact with customers and streamline customer service. Learn more!
> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
|
|
From: Erik V. <eri...@xs...> - 2011-07-21 22:20:00
|
Eclipse 3.6.2 (Helios) on Windows 7. Erik. > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Thursday, July 21, 2011 10:30 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > isnowavailable.] > > Yeah... let me give more detail. > > I've updated my setup to Indigo on both OS X 10.5 and Fedora 15 systems. > > ---Brett. > > > > On Thu, Jul 21, 2011 at 12:56 PM, Stefan Frey <ste...@we...> wrote: > > Brett raised the issue of different problems depending on > > platform/eclipse version and he started reporting the platform he uses. > > > > I run Eclipse Helios (Build id: 20100617-1415) on an OpenSuse 11.3 > > Linux distribution. > > > > Egit is from the Helios update link. > > Stefan > > > > > > On Thursday, July 21, 2011 06:25:40 pm brett lentz wrote: > >> I also noticed that there's a new version of Eclipse out. This > >> version is named "Indigo". I wonder if there are differences that > >> Egit isn't handling very well. > >> > >> ---Brett. > >> > >> > >> > >> On Thu, Jul 21, 2011 at 3:24 AM, Dr....@t-... > >> > >> <Dr....@t-...> wrote: > >> > Hi all, > >> > I also installed the jgit and egit modules and repeatedly ran into > >> > problems trying to fetch/get the commits and have them displayed > >> > properly in the eclipse history. Even though the fetch or pull > >> > finished and stated there was no new ref on the remote origin the > >> > history showed that one or more commits didnt reach my working > >> > copy. I.e the history was showng a different hash asa the actual > >> > git repository on rails.sf.net. > >> > > >> > i currently (state of yesterday) rebuild the local repository with > >> > a new clone and was able to see the latest changes. I suspect that > >> > either something is still buggy inside the eclipse modules or > >> > sourceforges git implementation is not what it should be. > >> > > >> > Or that the setup itself is needing some more foolproofing :) > >> > > >> > Regards Martin > >> > > >> > > >> > -----Original-Nachricht----- > >> > > >> >> Subject: Re: [Rails-devel] Git troubleshooting [was: Git > >> >> repository is now available.] > >> >> Date: Thu, 21 Jul 2011 11:46:42 +0200 > >> >> From: "Erik Vos" <eri...@xs...> > >> >> To: "'Development list for Rails: an 18xx game'" > >> >> <rai...@li...> > >> >> > >> >> OK, I have installed Git for Windows and am running Git Bash. > >> >> > >> >> 'git status' says: > >> >> > >> >> ---------------------------------------- > >> >> # On branch master > >> >> # Your branch and 'origin/master' have diverged, # and have 1 and > >> >> 3 different commit(s) each, respectively. > >> >> # > >> >> # Changes not staged for commit: > >> >> # (use "git add <file>..." to update what will be committed) # > >> >> (use "git checkout -- <file>..." to discard changes in working > >> >> directory) > >> >> # > >> >> # modified: data/1826/Game.xml # modified: > >> >> data/1870/Game.xml # modified: > >> >> rails/algorithms/NetworkTrain.java > >> >> # modified: rails/algorithms/RevenueAdapter.java > >> >> # modified: rails/algorithms/RevenueCalculator.java > >> >> # modified: rails/algorithms/RevenueCalculatorMulti.java > >> >> # modified: rails/algorithms/RevenueCalculatorSimple.java > >> >> # modified: rails/game/Train.java # modified: > >> >> rails/game/TrainI.java # # Untracked files: > >> >> # (use "git add <file>..." to include in what will be committed) > >> >> # # rails/algorithms/RevenueCalculatorMultiHex.java > >> >> no changes added to commit (use "git add" and/or "git commit -a") > >> >> ------------------------------------------------- > >> >> > >> >> 1. The "modified" files are Stefan's updates. Why are these > >> >> marked as "Changes not staged for commit"? Because these are in a > >> >> branch? What am I supposed to do? > >> >> > >> >> 2. What is the real status of the "Untracked" file > >> >> RevenueCalculatorMultiHex.java? This is the file for which Egit > >> >> showed a merge conflict. > >> >> Indeed the file icon is marked "?" so it's currently untracked. > >> >> What should I do? > >> >> > >> >> 'git push' says: > >> >> > >> >> ----------------------------------------------- > >> >> ! [rejected] master -> master (non-fast-forward) > >> >> error: failed to push some refs to > >> >> 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails' > >> >> To prevent you from losing history, non-fast-forward updates were > >> >> rejected Merge the remote changes (e.g. 'git pull') before pushing > >> >> again. See the 'Note about fast-forwards' section of 'git push > >> >> --help' for details. > >> >> Aborting > >> >> ---------------------------------------------- > >> >> > >> >> So I tried 'git pull', which says: > >> >> > >> >> ----------------------------------------------- > >> >> error: Your local changes to the following files would be > >> >> overwritten by merge: > >> >> data/1826/Game.xml > >> >> data/1870/Game.xml > >> >> rails/algorithms/NetworkTrain.java > >> >> rails/algorithms/RevenueAdapter.java > >> >> rails/algorithms/RevenueCalculator.java > >> >> rails/algorithms/RevenueCalculatorMulti.java > >> >> rails/algorithms/RevenueCalculatorSimple.java > >> >> rails/game/Train.java > >> >> rails/game/TrainI.java > >> >> Please, commit your changes or stash them before you can merge. > >> >> error: The following untracked working tree files would be > >> >> overwritten by merge: > >> >> rails/algorithms/RevenueCalculatorMultiHex.java > >> >> Please move or remove them before you can merge. > >> >> -------------------------------------------------- > >> >> > >> >> So it seems that Stefan's changes are already in my repository, > >> >> but are nevertheless in the way of pulling the very same changes > >> >> into my repository (again??). > >> >> > >> >> Before I start trying lots of other things: is there an easier way > >> >> out than to do it all over again, as Brett suggested? > >> >> > >> >> Erik. > >> >> > >> >> > -----Original Message----- > >> >> > From: Erik Vos [mailto:eri...@xs...] > >> >> > Sent: Wednesday, July 20, 2011 11:47 PM > >> >> > To: 'Development list for Rails: an 18xx game' > >> >> > Subject: Re: [Rails-devel] Git troubleshooting [was: Git > >> >> > repository is now available.] > >> >> > > >> >> > 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/rail > >> >> > > >> > > >> >> > > > >> >> > > > > s > >> >> > > > > > >> >> > > >> > > > 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/rail > >> >> > > >> > > >> > s >> > >> >> > > >> > > >> > >> >> > > >> > > >> 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-d > >> >> > > >> > > >> evel > >> >> > > > >> >> > > ------------------------------------------------------------- > >> >> > > >> > > >> >> > > > >> >> > > > > -- > >> >> > > > > > >> >> > > >> > > > --- > >> >> > > >> > > > -- > >> >> > > >> > > > ----- > >> >> > > >> > > > ----- 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-de > >> >> > > >> > > > vel > >> >> > > > >> >> > > -------------------------------------------------------------- > >> >> > > - >> > >> >> > > > >> >> > > > > -- > >> >> > > > > > >> >> > > >> > > --- > >> >> > > >> > > -- > >> >> > > >> > > ----- > >> >> > > >> > > --- 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-deve > >> >> > > >> > > l >> > >> >> > > > > >> >> > > > ------------------------------------------------------------ > >> >> > > > ------ > >> >> > > > -- -- > >> >> > > > ------ > >> >> > > > > >> >> > > >> -- > >> >> > > >> > >> >> > > >> > 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 > >> >> > >> >> ------------------------------------------------------------------ > >> >> ------ > >> >> ------ 5 Ways to Improve & Secure Unified Communications Unified > >> >> Communications promises greater efficiencies for business. UC can > >> >> improve internal communications as well as offer faster, more > >> >> efficient ways to interact with customers and streamline customer > >> >> service. Learn more! > >> >> http://www.accelacomm.com/jaw/sfnl/114/51426253/ > >> >> _______________________________________________ > >> >> Rails-devel mailing list > >> >> Rai...@li... > >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > > >> > ------------------------------------------------------------------- > >> > ------ > >> > ----- 5 Ways to Improve & Secure Unified Communications Unified > >> > Communications promises greater efficiencies for business. UC can > >> > improve internal communications as well as offer faster, more > >> > efficient ways to interact with customers and streamline customer > >> > service. Learn more! > >> > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > >> > _______________________________________________ > >> > Rails-devel mailing list > >> > Rai...@li... > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> --------------------------------------------------------------------- > >> ------ > >> --- 5 Ways to Improve & Secure Unified Communications Unified > >> Communications promises greater efficiencies for business. UC can > >> improve internal communications as well as offer faster, more > >> efficient ways to interact with customers and streamline customer > >> service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ---------------------------------------------------------------------- > > -------- > > 5 Ways to Improve & Secure Unified Communications Unified > > Communications promises greater efficiencies for business. UC can > > improve internal communications as well as offer faster, more > > efficient ways to interact with customers and streamline customer service. > Learn more! > > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications Unified > Communications promises greater efficiencies for business. UC can improve > internal communications as well as offer faster, more efficient ways to > interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: brett l. <bre...@gm...> - 2011-07-21 20:30:54
|
Yeah... let me give more detail. I've updated my setup to Indigo on both OS X 10.5 and Fedora 15 systems. ---Brett. On Thu, Jul 21, 2011 at 12:56 PM, Stefan Frey <ste...@we...> wrote: > Brett raised the issue of different problems depending on platform/eclipse > version and he started reporting the platform he uses. > > I run Eclipse Helios (Build id: 20100617-1415) > on an OpenSuse 11.3 Linux distribution. > > Egit is from the Helios update link. > Stefan > > > On Thursday, July 21, 2011 06:25:40 pm brett lentz wrote: >> I also noticed that there's a new version of Eclipse out. This version >> is named "Indigo". I wonder if there are differences that Egit isn't >> handling very well. >> >> ---Brett. >> >> >> >> On Thu, Jul 21, 2011 at 3:24 AM, Dr....@t-... >> >> <Dr....@t-...> wrote: >> > Hi all, >> > I also installed the jgit and egit modules and repeatedly ran into >> > problems trying to fetch/get the commits and have them displayed >> > properly in the eclipse history. Even though the fetch or pull finished >> > and stated there was no new ref on the remote origin the history showed >> > that one or more commits didnt reach my working copy. I.e the history >> > was showng a different hash asa the actual git repository on >> > rails.sf.net. >> > >> > i currently (state of yesterday) rebuild the local repository with a new >> > clone and was able to see the latest changes. I suspect that either >> > something is still buggy inside the eclipse modules or sourceforges git >> > implementation is not what it should be. >> > >> > Or that the setup itself is needing some more foolproofing :) >> > >> > Regards Martin >> > >> > >> > -----Original-Nachricht----- >> > >> >> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository >> >> is now available.] >> >> Date: Thu, 21 Jul 2011 11:46:42 +0200 >> >> From: "Erik Vos" <eri...@xs...> >> >> To: "'Development list for Rails: an 18xx game'" >> >> <rai...@li...> >> >> >> >> OK, I have installed Git for Windows and am running Git Bash. >> >> >> >> 'git status' says: >> >> >> >> ---------------------------------------- >> >> # On branch master >> >> # Your branch and 'origin/master' have diverged, >> >> # and have 1 and 3 different commit(s) each, respectively. >> >> # >> >> # Changes not staged for commit: >> >> # (use "git add <file>..." to update what will be committed) >> >> # (use "git checkout -- <file>..." to discard changes in working >> >> directory) >> >> # >> >> # modified: data/1826/Game.xml >> >> # modified: data/1870/Game.xml >> >> # modified: rails/algorithms/NetworkTrain.java >> >> # modified: rails/algorithms/RevenueAdapter.java >> >> # modified: rails/algorithms/RevenueCalculator.java >> >> # modified: rails/algorithms/RevenueCalculatorMulti.java >> >> # modified: rails/algorithms/RevenueCalculatorSimple.java >> >> # modified: rails/game/Train.java >> >> # modified: rails/game/TrainI.java >> >> # >> >> # Untracked files: >> >> # (use "git add <file>..." to include in what will be committed) # >> >> # rails/algorithms/RevenueCalculatorMultiHex.java >> >> no changes added to commit (use "git add" and/or "git commit -a") >> >> ------------------------------------------------- >> >> >> >> 1. The "modified" files are Stefan's updates. Why are these marked as >> >> "Changes not staged for commit"? Because these are in a branch? What >> >> am I supposed to do? >> >> >> >> 2. What is the real status of the "Untracked" file >> >> RevenueCalculatorMultiHex.java? This is the file for which Egit >> >> showed a merge conflict. >> >> Indeed the file icon is marked "?" so it's currently untracked. What >> >> should I do? >> >> >> >> 'git push' says: >> >> >> >> ----------------------------------------------- >> >> ! [rejected] master -> master (non-fast-forward) >> >> error: failed to push some refs to >> >> 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails' >> >> To prevent you from losing history, non-fast-forward updates were >> >> rejected Merge the remote changes (e.g. 'git pull') before pushing >> >> again. See the 'Note about fast-forwards' section of 'git push >> >> --help' for details. >> >> Aborting >> >> ---------------------------------------------- >> >> >> >> So I tried 'git pull', which says: >> >> >> >> ----------------------------------------------- >> >> error: Your local changes to the following files would be overwritten >> >> by merge: >> >> data/1826/Game.xml >> >> data/1870/Game.xml >> >> rails/algorithms/NetworkTrain.java >> >> rails/algorithms/RevenueAdapter.java >> >> rails/algorithms/RevenueCalculator.java >> >> rails/algorithms/RevenueCalculatorMulti.java >> >> rails/algorithms/RevenueCalculatorSimple.java >> >> rails/game/Train.java >> >> rails/game/TrainI.java >> >> Please, commit your changes or stash them before you can merge. >> >> error: The following untracked working tree files would be overwritten >> >> by merge: >> >> rails/algorithms/RevenueCalculatorMultiHex.java >> >> Please move or remove them before you can merge. >> >> -------------------------------------------------- >> >> >> >> So it seems that Stefan's changes are already in my repository, but >> >> are nevertheless in the way of pulling the very same changes into my >> >> repository (again??). >> >> >> >> Before I start trying lots of other things: is there an easier way out >> >> than to do it all over again, as Brett suggested? >> >> >> >> Erik. >> >> >> >> > -----Original Message----- >> >> > From: Erik Vos [mailto:eri...@xs...] >> >> > Sent: Wednesday, July 20, 2011 11:47 PM >> >> > To: 'Development list for Rails: an 18xx game' >> >> > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository >> >> > is now available.] >> >> > >> >> > 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/rail >> > >> >> > > >> >> > > > > s >> >> > > > > >> >> > > >> > > > 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 >> >> >> >> ------------------------------------------------------------------------ >> >> ---- -- >> >> >> >> > 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 >> >> >> >> ------------------------------------------------------------------------ >> >> ------ 5 Ways to Improve & Secure Unified Communications >> >> Unified Communications promises greater efficiencies for business. UC >> >> can improve internal communications as well as offer faster, more >> >> efficient ways to interact with customers and streamline customer >> >> service. Learn more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ >> >> _______________________________________________ >> >> Rails-devel mailing list >> >> Rai...@li... >> >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > ------------------------------------------------------------------------- >> > ----- 5 Ways to Improve & Secure Unified Communications >> > Unified Communications promises greater efficiencies for business. UC can >> > improve internal communications as well as offer faster, more efficient >> > ways to interact with customers and streamline customer service. Learn >> > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> --------------------------------------------------------------------------- >> --- 5 Ways to Improve & Secure Unified Communications >> Unified Communications promises greater efficiencies for business. UC can >> improve internal communications as well as offer faster, more efficient >> ways to interact with customers and streamline customer service. Learn >> more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient ways > to interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
|
From: brett l. <bre...@gm...> - 2011-07-21 20:28:41
|
Really?
My initial reaction is that it sounds like a design flaw if the XML
properties can change in the span of 3 lines, especially given that
our current init code isn't multi-threaded.
Can you identify a case where this actually happens (and is a good thing)?
---Brett.
On Thu, Jul 21, 2011 at 12:52 PM, Erik Vos <eri...@xs...> wrote:
> Brett,
>
> I don't think this is a good change, because 'optionValue' may have been
> assigned between the first and the second identical ifs.
> This second if [ if (optionValue == null) ] should be read as: if
> optionValue is *still* null, then...
>
> Erik.
>
>> -----Original Message-----
>> From: Brett Lentz [mailto:wak...@us...]
>> Sent: Thursday, July 21, 2011 7:02 PM
>> To: rai...@li...
>> Subject: [Rails-commits] rails/common
>>
>> rails/common/parser/Tag.java | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> New commits:
>> commit 6b7255acdcdfd3217884ae2701975166df7350b8
>> Author: Brett Lentz <bl...@cl...>
>> Date: Thu Jul 21 09:58:42 2011 -0700
>>
>> Tag: simplify conditional logic.
>>
>> This is really a spurious commit to test Egit.
>>
>> diff --git a/rails/common/parser/Tag.java b/rails/common/parser/Tag.java
>> index 22c3c0a..7a7d46e 100644
>> --- a/rails/common/parser/Tag.java
>> +++ b/rails/common/parser/Tag.java
>> @@ -326,9 +326,6 @@ public class Tag {
>> break;
>> }
>> }
>> - }
>> -
>> - if (optionValue == null) {
>> // Take the default value
>> GameOption go = GameOption.getByName(name);
>> optionValue = go != null ? go.getDefaultValue() :
> "";
>>
>>
>>
>>
> ----------------------------------------------------------------------------
> --
>> 5 Ways to Improve & Secure Unified Communications Unified
>> Communications promises greater efficiencies for business. UC can improve
>> internal communications as well as offer faster, more efficient ways to
>> interact with customers and streamline customer service. Learn more!
>> http://www.accelacomm.com/jaw/sfnl/114/51426253/
>> _______________________________________________
>> Rails-commits mailing list
>> Rai...@li...
>> https://lists.sourceforge.net/lists/listinfo/rails-commits
>
>
> ------------------------------------------------------------------------------
> 5 Ways to Improve & Secure Unified Communications
> Unified Communications promises greater efficiencies for business. UC can
> improve internal communications as well as offer faster, more efficient ways
> to interact with customers and streamline customer service. Learn more!
> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
|
|
From: Stefan F. <ste...@we...> - 2011-07-21 19:54:06
|
Brett raised the issue of different problems depending on platform/eclipse version and he started reporting the platform he uses. I run Eclipse Helios (Build id: 20100617-1415) on an OpenSuse 11.3 Linux distribution. Egit is from the Helios update link. Stefan On Thursday, July 21, 2011 06:25:40 pm brett lentz wrote: > I also noticed that there's a new version of Eclipse out. This version > is named "Indigo". I wonder if there are differences that Egit isn't > handling very well. > > ---Brett. > > > > On Thu, Jul 21, 2011 at 3:24 AM, Dr....@t-... > > <Dr....@t-...> wrote: > > Hi all, > > I also installed the jgit and egit modules and repeatedly ran into > > problems trying to fetch/get the commits and have them displayed > > properly in the eclipse history. Even though the fetch or pull finished > > and stated there was no new ref on the remote origin the history showed > > that one or more commits didnt reach my working copy. I.e the history > > was showng a different hash asa the actual git repository on > > rails.sf.net. > > > > i currently (state of yesterday) rebuild the local repository with a new > > clone and was able to see the latest changes. I suspect that either > > something is still buggy inside the eclipse modules or sourceforges git > > implementation is not what it should be. > > > > Or that the setup itself is needing some more foolproofing :) > > > > Regards Martin > > > > > > -----Original-Nachricht----- > > > >> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > >> is now available.] > >> Date: Thu, 21 Jul 2011 11:46:42 +0200 > >> From: "Erik Vos" <eri...@xs...> > >> To: "'Development list for Rails: an 18xx game'" > >> <rai...@li...> > >> > >> OK, I have installed Git for Windows and am running Git Bash. > >> > >> 'git status' says: > >> > >> ---------------------------------------- > >> # On branch master > >> # Your branch and 'origin/master' have diverged, > >> # and have 1 and 3 different commit(s) each, respectively. > >> # > >> # Changes not staged for commit: > >> # (use "git add <file>..." to update what will be committed) > >> # (use "git checkout -- <file>..." to discard changes in working > >> directory) > >> # > >> # modified: data/1826/Game.xml > >> # modified: data/1870/Game.xml > >> # modified: rails/algorithms/NetworkTrain.java > >> # modified: rails/algorithms/RevenueAdapter.java > >> # modified: rails/algorithms/RevenueCalculator.java > >> # modified: rails/algorithms/RevenueCalculatorMulti.java > >> # modified: rails/algorithms/RevenueCalculatorSimple.java > >> # modified: rails/game/Train.java > >> # modified: rails/game/TrainI.java > >> # > >> # Untracked files: > >> # (use "git add <file>..." to include in what will be committed) # > >> # rails/algorithms/RevenueCalculatorMultiHex.java > >> no changes added to commit (use "git add" and/or "git commit -a") > >> ------------------------------------------------- > >> > >> 1. The "modified" files are Stefan's updates. Why are these marked as > >> "Changes not staged for commit"? Because these are in a branch? What > >> am I supposed to do? > >> > >> 2. What is the real status of the "Untracked" file > >> RevenueCalculatorMultiHex.java? This is the file for which Egit > >> showed a merge conflict. > >> Indeed the file icon is marked "?" so it's currently untracked. What > >> should I do? > >> > >> 'git push' says: > >> > >> ----------------------------------------------- > >> ! [rejected] master -> master (non-fast-forward) > >> error: failed to push some refs to > >> 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails' > >> To prevent you from losing history, non-fast-forward updates were > >> rejected Merge the remote changes (e.g. 'git pull') before pushing > >> again. See the 'Note about fast-forwards' section of 'git push > >> --help' for details. > >> Aborting > >> ---------------------------------------------- > >> > >> So I tried 'git pull', which says: > >> > >> ----------------------------------------------- > >> error: Your local changes to the following files would be overwritten > >> by merge: > >> data/1826/Game.xml > >> data/1870/Game.xml > >> rails/algorithms/NetworkTrain.java > >> rails/algorithms/RevenueAdapter.java > >> rails/algorithms/RevenueCalculator.java > >> rails/algorithms/RevenueCalculatorMulti.java > >> rails/algorithms/RevenueCalculatorSimple.java > >> rails/game/Train.java > >> rails/game/TrainI.java > >> Please, commit your changes or stash them before you can merge. > >> error: The following untracked working tree files would be overwritten > >> by merge: > >> rails/algorithms/RevenueCalculatorMultiHex.java > >> Please move or remove them before you can merge. > >> -------------------------------------------------- > >> > >> So it seems that Stefan's changes are already in my repository, but > >> are nevertheless in the way of pulling the very same changes into my > >> repository (again??). > >> > >> Before I start trying lots of other things: is there an easier way out > >> than to do it all over again, as Brett suggested? > >> > >> Erik. > >> > >> > -----Original Message----- > >> > From: Erik Vos [mailto:eri...@xs...] > >> > Sent: Wednesday, July 20, 2011 11:47 PM > >> > To: 'Development list for Rails: an 18xx game' > >> > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > >> > is now available.] > >> > > >> > 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/rail >> > > >> > > > >> > > > > s > >> > > > > > >> > > >> > > > 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 > >> > >> ------------------------------------------------------------------------ > >> ---- -- > >> > >> > 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 > >> > >> ------------------------------------------------------------------------ > >> ------ 5 Ways to Improve & Secure Unified Communications > >> Unified Communications promises greater efficiencies for business. UC > >> can improve internal communications as well as offer faster, more > >> efficient ways to interact with customers and streamline customer > >> service. Learn more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------- > > ----- 5 Ways to Improve & Secure Unified Communications > > Unified Communications promises greater efficiencies for business. UC can > > improve internal communications as well as offer faster, more efficient > > ways to interact with customers and streamline customer service. Learn > > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > --------------------------------------------------------------------------- > --- 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient > ways to interact with customers and streamline customer service. Learn > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: Erik V. <eri...@xs...> - 2011-07-21 19:52:31
|
Brett,
I don't think this is a good change, because 'optionValue' may have been
assigned between the first and the second identical ifs.
This second if [ if (optionValue == null) ] should be read as: if
optionValue is *still* null, then...
Erik.
> -----Original Message-----
> From: Brett Lentz [mailto:wak...@us...]
> Sent: Thursday, July 21, 2011 7:02 PM
> To: rai...@li...
> Subject: [Rails-commits] rails/common
>
> rails/common/parser/Tag.java | 3 ---
> 1 file changed, 3 deletions(-)
>
> New commits:
> commit 6b7255acdcdfd3217884ae2701975166df7350b8
> Author: Brett Lentz <bl...@cl...>
> Date: Thu Jul 21 09:58:42 2011 -0700
>
> Tag: simplify conditional logic.
>
> This is really a spurious commit to test Egit.
>
> diff --git a/rails/common/parser/Tag.java b/rails/common/parser/Tag.java
> index 22c3c0a..7a7d46e 100644
> --- a/rails/common/parser/Tag.java
> +++ b/rails/common/parser/Tag.java
> @@ -326,9 +326,6 @@ public class Tag {
> break;
> }
> }
> - }
> -
> - if (optionValue == null) {
> // Take the default value
> GameOption go = GameOption.getByName(name);
> optionValue = go != null ? go.getDefaultValue() :
"";
>
>
>
>
----------------------------------------------------------------------------
--
> 5 Ways to Improve & Secure Unified Communications Unified
> Communications promises greater efficiencies for business. UC can improve
> internal communications as well as offer faster, more efficient ways to
> interact with customers and streamline customer service. Learn more!
> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> _______________________________________________
> Rails-commits mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-commits
|
|
From: brett l. <bre...@gm...> - 2011-07-21 19:28:18
|
On Thu, Jul 21, 2011 at 11:41 AM, Stefan Frey <ste...@we...> wrote: > Brett, > thanks for your support. Some comments below. > > I have used subversion for several years now (I switched to svn as soon as it > worked somehow). > > My experience with subversion was that if you do not follow the recommended > workflow from the beginning you are in a mess (e.g. not setting up the repo > with trunk/branch/tag, avoid berkleyDB ...). > Git is a *very* different tool, written to *very* different requirements. SVN is "CVS done right", ignoring the fact that the CVS design is fundamentally flawed and using a development methodology from the 1980s (the initial release of Gnu RCS was in 1982, and CVS is the successor to RCS). Whereas Git is "Let's make a brand new VCS that can handle the current linux-kernel development model." Git is solving today's problems where SVN is (re-)solving 20-30 year old problems. I've had numerous problems over the years with corrupt SVN DBs; or somebody using the wrong version of the SVN client and the stupid server auto-upgrades the central SVN repo's DB, which makes all other clients incompatible and causes much breakage. There are many design decisions that SVN made that, IMO, are seriously flawed. One of the things Git does right, IMO, is that it doesn't complicate things with crap like using a DB. Everything in the .git directory is a file. Your changes are stored as plain-text diffs. For performance, Git gzips the files and repacks them, but they're all accessible for viewing if you care to look. I have a suspicion that this is the reason that I can muck with Git outside of Eclipse and have EGit "just work". It doesn't have to interface with a DB. It just looks at the state of the filesystem and can see updates and just automatically refresh the view inside Eclipse. As I've seen Linus post a few different times, "Git is a stupid content tracker." It's stupid, which makes it very smart. ;-) > On Thursday, July 21, 2011 07:59:43 pm brett lentz wrote: >> Ok... I've made a few small commits with EGit, and I think I'm getting >> the hang of the interface. It's a bit clumsy, but it seems to do >> everything I expect. The EGit user guide is a fairly lengthy document, >> but as Stefan noted earlier, it's got a lot of important details that >> will help you learn the interface: >> http://wiki.eclipse.org/EGit/User_Guide > > The main issue I have with the document is that if you are potential user of > git most likely you do not need snapshots of each dialog, but better > explanations and FAQs. > > It is like the assumption of Microsoft (in the beginning) that admins would > prefer day-by-day work using a GUI. > Agreed. The screenshots aren't super-helpful and a few are even outdated. But, that's the way they chose to write their docs. >> >> Next... >> >> Also, in your git configs (usually a .gitconfig file in your home >> directory), it's very handy to default to always rebasing incoming >> changes. Merge commits are supposed to be meaningful, but the default >> behavior is to always merge incoming changes (and create a merge >> commit for them). The tradeoff here is that rebasing changes the >> commit history, which is potentially dangerous and less obvious than >> adding a bunch of extraneous merge commits every time you do a pull. > > Now you lost me: First you suggest to always rebase incoming changings and > then you claim that it is potentially dangerous. Why should I choose such an > option? Rebasing is changing the ordering of the commit history. It's an incredibly important and powerful feature, but changing history is one of those topics that's traditionally very scary to users. And, yes, I've seen a number of "OMG! Rebasing ate my baby!" blog posts from users who have misused or misunderstood the feature. It's the one feature that trips people up the most because it's a completely foreign concept if you're coming from CVS/SVN. My point was, it's not the default behavior for good reason. However, for the simple "git pull" operation, it tends to be the best option (once you understand how it works) because it keeps the commit history cleaner and separates the "update from upstream" and "merge your local work" steps into two discrete actions. This separation makes it more clear when the rebase of upstream changes causes a merge conflict and when your local changes are causing the merge conflict. This is one of those areas in which; unlike CVS/SVN, where you can get away with not caring about the tool's internals; it is very helpful to have some knowledge of _how_ Git works because it helps you do more advanced things with the repository. > > More seriously: > This is set in the branching dialog for each branch. Given the documentation > egit should use the default from .gitconfig for new branches, the egit default > is merging. > > http://wiki.eclipse.org/EGit/User_Guide#Branching > > The connection is then set for the tracking relationship (rebase or merge on > pull) and it seems that this cannot be changed via UI (maybe by setting a > property in the git explorer view). > > see here > http://wiki.eclipse.org/EGit/User_Guide#Pulling_New_Changes_from_Upstream_Branch > > And the link above has a critical reminder for Windows user: > There is an existing bug such that WIndows users should avoid "git pull" on > the command line if using egit. > Yep. We're going to need to learn platform-specific issues with the new tool. My main machines are running Linux or Mac OS X. I've got an old Windows machine I use occasionally, but not often. > Hope it will soon all be sorted out. Yes. Unfortunately, this is one of the down sides to EGit. For better or worse, they decided to use a complete re-implementation of Git in Java (JGit) instead of just hooking into the pre-existing tools and libraries. It's not the choice I'd have made, but that's what they went with. I'm certain it'll get better over time. Judging by the mailing list, the project is under active development, so we should see fixes relatively soon. The project has already come a long way in the last year (when we opted for CVS->SVN instead of CVS->Git) and I'm confident these issues will be sorted relatively soon. > Stefan > ---Brett. |
|
From: Stefan F. <ste...@we...> - 2011-07-21 18:39:40
|
Brett, thanks for your support. Some comments below. I have used subversion for several years now (I switched to svn as soon as it worked somehow). My experience with subversion was that if you do not follow the recommended workflow from the beginning you are in a mess (e.g. not setting up the repo with trunk/branch/tag, avoid berkleyDB ...). On Thursday, July 21, 2011 07:59:43 pm brett lentz wrote: > Ok... I've made a few small commits with EGit, and I think I'm getting > the hang of the interface. It's a bit clumsy, but it seems to do > everything I expect. The EGit user guide is a fairly lengthy document, > but as Stefan noted earlier, it's got a lot of important details that > will help you learn the interface: > http://wiki.eclipse.org/EGit/User_Guide The main issue I have with the document is that if you are potential user of git most likely you do not need snapshots of each dialog, but better explanations and FAQs. It is like the assumption of Microsoft (in the beginning) that admins would prefer day-by-day work using a GUI. > > I think everyone should probably take a step back. I have a feeling we > tried to run before we learned to walk. ;-) > > Set aside the work you've done, do a clean clone of the repo in a new > location following the EGit User Guide. Then, find some small one-line > change to make. Commit it, push it, as directed by the User Guide. > Let's try to get everyone to commit and successfully push a few small > changes before we try to bite off anything bigger. Once we've got a > few pushes and pulls done, we can come back to the bigger pieces of > work that are being done. OK. > > Next... > > Also, in your git configs (usually a .gitconfig file in your home > directory), it's very handy to default to always rebasing incoming > changes. Merge commits are supposed to be meaningful, but the default > behavior is to always merge incoming changes (and create a merge > commit for them). The tradeoff here is that rebasing changes the > commit history, which is potentially dangerous and less obvious than > adding a bunch of extraneous merge commits every time you do a pull. Now you lost me: First you suggest to always rebase incoming changings and then you claim that it is potentially dangerous. Why should I choose such an option? More seriously: This is set in the branching dialog for each branch. Given the documentation egit should use the default from .gitconfig for new branches, the egit default is merging. http://wiki.eclipse.org/EGit/User_Guide#Branching The connection is then set for the tracking relationship (rebase or merge on pull) and it seems that this cannot be changed via UI (maybe by setting a property in the git explorer view). see here http://wiki.eclipse.org/EGit/User_Guide#Pulling_New_Changes_from_Upstream_Branch And the link above has a critical reminder for Windows user: There is an existing bug such that WIndows users should avoid "git pull" on the command line if using egit. Hope it will soon all be sorted out. Stefan |
|
From: brett l. <bre...@gm...> - 2011-07-21 18:05:28
|
Oh... One more note: EGit seems to be pretty tolerant of me mucking about in the repository via the CLI. I haven't done anything too drastic yet, but so far it hasn't had a problem picking up changes I've done via the CLI. So, with any luck, that's a good difference between EGit and the SVN Eclipse plugin. ---Brett. On Thu, Jul 21, 2011 at 10:59 AM, brett lentz <bre...@gm...> wrote: > Ok... I've made a few small commits with EGit, and I think I'm getting > the hang of the interface. It's a bit clumsy, but it seems to do > everything I expect. The EGit user guide is a fairly lengthy document, > but as Stefan noted earlier, it's got a lot of important details that > will help you learn the interface: > http://wiki.eclipse.org/EGit/User_Guide > > I think everyone should probably take a step back. I have a feeling we > tried to run before we learned to walk. ;-) > > Set aside the work you've done, do a clean clone of the repo in a new > location following the EGit User Guide. Then, find some small one-line > change to make. Commit it, push it, as directed by the User Guide. > Let's try to get everyone to commit and successfully push a few small > changes before we try to bite off anything bigger. Once we've got a > few pushes and pulls done, we can come back to the bigger pieces of > work that are being done. > > Next... > > Also, in your git configs (usually a .gitconfig file in your home > directory), it's very handy to default to always rebasing incoming > changes. Merge commits are supposed to be meaningful, but the default > behavior is to always merge incoming changes (and create a merge > commit for them). The tradeoff here is that rebasing changes the > commit history, which is potentially dangerous and less obvious than > adding a bunch of extraneous merge commits every time you do a pull. > > You can configure certain branches to always do this without the --rebase flag: > > # make `git pull` on master always use rebase > $ git config branch.master.rebase true > You can also set up a global option to set the last property for every > new tracked branch: > > # setup rebase for every tracking branch > $ git config --global branch.autosetuprebase always > > The .gitconfig is an ini-style file, so the above is also represented > as this if you want to update the file directly: > > [branch] > autosetuprebase = always > > > Finally... > > I'm happy to continue lending support as y'all run into troubles. It > took me a while to fully acclimate to Git's workflow, too. It's > different, but very powerful once we get past the first few hurdles. > :-) > > ---Brett. > |
|
From: brett l. <bre...@gm...> - 2011-07-21 18:00:11
|
Ok... I've made a few small commits with EGit, and I think I'm getting the hang of the interface. It's a bit clumsy, but it seems to do everything I expect. The EGit user guide is a fairly lengthy document, but as Stefan noted earlier, it's got a lot of important details that will help you learn the interface: http://wiki.eclipse.org/EGit/User_Guide I think everyone should probably take a step back. I have a feeling we tried to run before we learned to walk. ;-) Set aside the work you've done, do a clean clone of the repo in a new location following the EGit User Guide. Then, find some small one-line change to make. Commit it, push it, as directed by the User Guide. Let's try to get everyone to commit and successfully push a few small changes before we try to bite off anything bigger. Once we've got a few pushes and pulls done, we can come back to the bigger pieces of work that are being done. Next... Also, in your git configs (usually a .gitconfig file in your home directory), it's very handy to default to always rebasing incoming changes. Merge commits are supposed to be meaningful, but the default behavior is to always merge incoming changes (and create a merge commit for them). The tradeoff here is that rebasing changes the commit history, which is potentially dangerous and less obvious than adding a bunch of extraneous merge commits every time you do a pull. You can configure certain branches to always do this without the --rebase flag: # make `git pull` on master always use rebase $ git config branch.master.rebase true You can also set up a global option to set the last property for every new tracked branch: # setup rebase for every tracking branch $ git config --global branch.autosetuprebase always The .gitconfig is an ini-style file, so the above is also represented as this if you want to update the file directly: [branch] autosetuprebase = always Finally... I'm happy to continue lending support as y'all run into troubles. It took me a while to fully acclimate to Git's workflow, too. It's different, but very powerful once we get past the first few hurdles. :-) ---Brett. |
|
From: brett l. <bre...@gm...> - 2011-07-21 16:26:11
|
I also noticed that there's a new version of Eclipse out. This version is named "Indigo". I wonder if there are differences that Egit isn't handling very well. ---Brett. On Thu, Jul 21, 2011 at 3:24 AM, Dr....@t-... <Dr....@t-...> wrote: > Hi all, > I also installed the jgit and egit modules and repeatedly ran into problems trying to fetch/get the commits and have them displayed properly in the eclipse history. Even though the fetch or pull finished and stated there was no new ref on the remote origin the history showed that one or more commits didnt reach my working copy. I.e the history was showng a different hash asa the actual git repository on rails.sf.net. > > i currently (state of yesterday) rebuild the local repository with a new clone and was able to see the latest changes. I suspect that either something is still buggy inside the eclipse modules or sourceforges git implementation is not what it should be. > > Or that the setup itself is needing some more foolproofing :) > > Regards Martin > > > -----Original-Nachricht----- >> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository >> is now available.] >> Date: Thu, 21 Jul 2011 11:46:42 +0200 >> From: "Erik Vos" <eri...@xs...> >> To: "'Development list for Rails: an 18xx game'" >> <rai...@li...> > >> OK, I have installed Git for Windows and am running Git Bash. >> >> 'git status' says: >> >> ---------------------------------------- >> # On branch master >> # Your branch and 'origin/master' have diverged, >> # and have 1 and 3 different commit(s) each, respectively. >> # >> # Changes not staged for commit: >> # (use "git add <file>..." to update what will be committed) >> # (use "git checkout -- <file>..." to discard changes in working >> directory) >> # >> # modified: data/1826/Game.xml >> # modified: data/1870/Game.xml >> # modified: rails/algorithms/NetworkTrain.java >> # modified: rails/algorithms/RevenueAdapter.java >> # modified: rails/algorithms/RevenueCalculator.java >> # modified: rails/algorithms/RevenueCalculatorMulti.java >> # modified: rails/algorithms/RevenueCalculatorSimple.java >> # modified: rails/game/Train.java >> # modified: rails/game/TrainI.java >> # >> # Untracked files: >> # (use "git add <file>..." to include in what will be committed) # >> # rails/algorithms/RevenueCalculatorMultiHex.java >> no changes added to commit (use "git add" and/or "git commit -a") >> ------------------------------------------------- >> >> 1. The "modified" files are Stefan's updates. Why are these marked as >> "Changes not staged for commit"? Because these are in a branch? What >> am I supposed to do? >> >> 2. What is the real status of the "Untracked" file >> RevenueCalculatorMultiHex.java? This is the file for which Egit >> showed a merge conflict. >> Indeed the file icon is marked "?" so it's currently untracked. What >> should I do? >> >> 'git push' says: >> >> ----------------------------------------------- >> ! [rejected] master -> master (non-fast-forward) >> error: failed to push some refs to >> 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails' >> To prevent you from losing history, non-fast-forward updates were >> rejected Merge the remote changes (e.g. 'git pull') before pushing >> again. See the 'Note about fast-forwards' section of 'git push >> --help' for details. >> Aborting >> ---------------------------------------------- >> >> So I tried 'git pull', which says: >> >> ----------------------------------------------- >> error: Your local changes to the following files would be overwritten >> by merge: >> data/1826/Game.xml >> data/1870/Game.xml >> rails/algorithms/NetworkTrain.java >> rails/algorithms/RevenueAdapter.java >> rails/algorithms/RevenueCalculator.java >> rails/algorithms/RevenueCalculatorMulti.java >> rails/algorithms/RevenueCalculatorSimple.java >> rails/game/Train.java >> rails/game/TrainI.java >> Please, commit your changes or stash them before you can merge. >> error: The following untracked working tree files would be overwritten >> by merge: >> rails/algorithms/RevenueCalculatorMultiHex.java >> Please move or remove them before you can merge. >> -------------------------------------------------- >> >> So it seems that Stefan's changes are already in my repository, but >> are nevertheless in the way of pulling the very same changes into my >> repository (again??). >> >> Before I start trying lots of other things: is there an easier way out >> than to do it all over again, as Brett suggested? >> >> Erik. >> >> >> > -----Original Message----- >> > From: Erik Vos [mailto:eri...@xs...] >> > Sent: Wednesday, July 20, 2011 11:47 PM >> > To: 'Development list for Rails: an 18xx game' >> > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository >> > is now available.] >> > >> > 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/rail >> > >> > > > > s >> > > >> > > > >> > > >> > > > 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 >> > >> > >> > >> ---------------------------------------------------------------------------- >> -- >> >> > 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 >> > >> >> >> ------------------------------------------------------------------------------ >> 5 Ways to Improve & Secure Unified Communications >> Unified Communications promises greater efficiencies for business. UC >> can improve internal communications as well as offer faster, more >> efficient ways to interact with customers and streamline customer >> service. Learn more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> > > > > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient ways > to interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
|
From: brett l. <bre...@gm...> - 2011-07-21 15:31:01
|
On Thu, Jul 21, 2011 at 2:46 AM, Erik Vos <eri...@xs...> wrote:
> OK, I have installed Git for Windows and am running Git Bash.
>
> 'git status' says:
>
> ----------------------------------------
> # On branch master
> # Your branch and 'origin/master' have diverged,
> # and have 1 and 3 different commit(s) each, respectively.
> #
Ok... this is good. There's your commit and Stefan's commits. It's
telling you that Stefan's commits aren't yet completely pulled into
your working copy.
> -------------------------------------------------
>
> 1. The "modified" files are Stefan's updates. Why are these marked as
> "Changes not staged for commit"? Because these are in a branch?
> What am I supposed to do?
No. They're not showing from a branch. The answer lies with #2...
> 2. What is the real status of the "Untracked" file
> RevenueCalculatorMultiHex.java? This is the file for which Egit showed a
> merge conflict.
> Indeed the file icon is marked "?" so it's currently untracked. What should
> I do?
>
Ok... if there's a merge conflict, that needs to be resolved before
pulling in the upstream changes can happen.
The way Git handles merges is that it edits the conflicting file, and
puts the conflicting section side-by-side so that you can use your
text editor to choose which portion of the differences is "correct".
Once you've resolved the merge conflict, you can re-commit these
change to your local tree, and finish pulling in the new changes.
The "git mergetool" feature helps you work with merges. For me,
because I use Vim as my default editor, mergetool shows me 3 split
panels of the local, remote, and conflicting files. I find this is
helps me see what went wrong.
However... there's more...
> 'git push' says:
>
> -----------------------------------------------
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to
> 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
> 'Note about fast-forwards' section of 'git push --help' for details.
> Aborting
> ----------------------------------------------
Yep. That's as I've mentioned. No pushing until all of the upstream
changes are accounted for in your local tree.
>
> So I tried 'git pull', which says:
>
> -----------------------------------------------
> error: Your local changes to the following files would be overwritten by
> merge:
>
> Please, commit your changes or stash them before you can merge.
> error: The following untracked working tree files would be overwritten by
> merge:
>
> Please move or remove them before you can merge.
> --------------------------------------------------
>
> So it seems that Stefan's changes are already in my repository, but are
> nevertheless in the way of pulling the very same changes into my repository
> (again??).
>
> Before I start trying lots of other things: is there an easier way out than
> to do it all over again, as Brett suggested?
>
The easiest way out is "git reset --hard". This will reset your
working tree back to the previous commit state. This is a destructive
command. It will destroy the changes in those files and revert them
back to what they were in your last commit.
This will let you attempt the pull again. You can try "git pull
--rebase" which, instead of doing a merge on your current changed
tree, it rewinds your HEAD back to align with the remote tree, brings
the remote changes into your tree so that you're current with
origin/HEAD, *THEN* applies your commits on top of the new history.
This is often more successful and if there's a merge conflict, it's a
conflict with your work, so you have a better idea of which code to
keep.
> Erik.
>
----Brett
>> -----Original Message-----
>> From: Erik Vos [mailto:eri...@xs...]
>> Sent: Wednesday, July 20, 2011 11:47 PM
>> To: 'Development list for Rails: an 18xx game'
>> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is now
>> available.]
>>
>> 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/rail
>> > >> > > > s
>> > >> > > >
>> > >> > > > 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
>>
>>
>>
> ----------------------------------------------------------------------------
> --
>> 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
>
>
> ------------------------------------------------------------------------------
> 5 Ways to Improve & Secure Unified Communications
> Unified Communications promises greater efficiencies for business. UC can
> improve internal communications as well as offer faster, more efficient ways
> to interact with customers and streamline customer service. Learn more!
> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
|
|
From: Stefan F. <ste...@we...> - 2011-07-21 12:16:43
|
Martin, one thing I nearly missed in the documentation of egit is that the physical folder of your local git repository must NOT reside inside the eclipse workspace you are using. My first idea was to setup exactly like that. Other than that I can offer no help, let us wait for Brett ;-) Stefan On Thursday, July 21, 2011 12:24:41 pm Dr....@t-... wrote: > Hi all, > I also installed the jgit and egit modules and repeatedly ran into problems > trying to fetch/get the commits and have them displayed properly in the > eclipse history. Even though the fetch or pull finished and stated there > was no new ref on the remote origin the history showed that one or more > commits didnt reach my working copy. I.e the history was showng a > different hash asa the actual git repository on rails.sf.net. > > i currently (state of yesterday) rebuild the local repository with a new > clone and was able to see the latest changes. I suspect that either > something is still buggy inside the eclipse modules or sourceforges git > implementation is not what it should be. > > Or that the setup itself is needing some more foolproofing :) > > Regards Martin > > > -----Original-Nachricht----- > > > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > > is now available.] > > Date: Thu, 21 Jul 2011 11:46:42 +0200 > > From: "Erik Vos" <eri...@xs...> > > To: "'Development list for Rails: an 18xx game'" > > <rai...@li...> > > > > OK, I have installed Git for Windows and am running Git Bash. > > > > 'git status' says: > > > > ---------------------------------------- > > # On branch master > > # Your branch and 'origin/master' have diverged, > > # and have 1 and 3 different commit(s) each, respectively. > > # > > # Changes not staged for commit: > > # (use "git add <file>..." to update what will be committed) > > # (use "git checkout -- <file>..." to discard changes in working > > directory) > > # > > # modified: data/1826/Game.xml > > # modified: data/1870/Game.xml > > # modified: rails/algorithms/NetworkTrain.java > > # modified: rails/algorithms/RevenueAdapter.java > > # modified: rails/algorithms/RevenueCalculator.java > > # modified: rails/algorithms/RevenueCalculatorMulti.java > > # modified: rails/algorithms/RevenueCalculatorSimple.java > > # modified: rails/game/Train.java > > # modified: rails/game/TrainI.java > > # > > # Untracked files: > > # (use "git add <file>..." to include in what will be committed) # > > # rails/algorithms/RevenueCalculatorMultiHex.java > > no changes added to commit (use "git add" and/or "git commit -a") > > ------------------------------------------------- > > > > 1. The "modified" files are Stefan's updates. Why are these marked as > > "Changes not staged for commit"? Because these are in a branch? What > > am I supposed to do? > > > > 2. What is the real status of the "Untracked" file > > RevenueCalculatorMultiHex.java? This is the file for which Egit > > showed a merge conflict. > > Indeed the file icon is marked "?" so it's currently untracked. What > > should I do? > > > > 'git push' says: > > > > ----------------------------------------------- > > ! [rejected] master -> master (non-fast-forward) > > error: failed to push some refs to > > 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails' > > To prevent you from losing history, non-fast-forward updates were > > rejected Merge the remote changes (e.g. 'git pull') before pushing > > again. See the 'Note about fast-forwards' section of 'git push > > --help' for details. > > Aborting > > ---------------------------------------------- > > > > So I tried 'git pull', which says: > > > > ----------------------------------------------- > > error: Your local changes to the following files would be overwritten > > by merge: > > data/1826/Game.xml > > data/1870/Game.xml > > rails/algorithms/NetworkTrain.java > > rails/algorithms/RevenueAdapter.java > > rails/algorithms/RevenueCalculator.java > > rails/algorithms/RevenueCalculatorMulti.java > > rails/algorithms/RevenueCalculatorSimple.java > > rails/game/Train.java > > rails/game/TrainI.java > > Please, commit your changes or stash them before you can merge. > > error: The following untracked working tree files would be overwritten > > by merge: > > rails/algorithms/RevenueCalculatorMultiHex.java > > Please move or remove them before you can merge. > > -------------------------------------------------- > > > > So it seems that Stefan's changes are already in my repository, but > > are nevertheless in the way of pulling the very same changes into my > > repository (again??). > > > > Before I start trying lots of other things: is there an easier way out > > than to do it all over again, as Brett suggested? > > > > Erik. > > > > > -----Original Message----- > > > From: Erik Vos [mailto:eri...@xs...] > > > Sent: Wednesday, July 20, 2011 11:47 PM > > > To: 'Development list for Rails: an 18xx game' > > > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > > > is now available.] > > > > > > 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/rail >> > > > > > > > > > > > s > > > > > > > > > > >> > > > 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 > > > > ------------------------------------------------------------------------- > > --- -- > > > > > 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 > > > > ------------------------------------------------------------------------- > > ----- 5 Ways to Improve & Secure Unified Communications > > Unified Communications promises greater efficiencies for business. UC > > can improve internal communications as well as offer faster, more > > efficient ways to interact with customers and streamline customer > > service. Learn more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > --------------------------------------------------------------------------- > --- 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient > ways to interact with customers and streamline customer service. Learn > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: <Dr....@t-...> - 2011-07-21 10:25:03
|
Hi all, I also installed the jgit and egit modules and repeatedly ran into problems trying to fetch/get the commits and have them displayed properly in the eclipse history. Even though the fetch or pull finished and stated there was no new ref on the remote origin the history showed that one or more commits didnt reach my working copy. I.e the history was showng a different hash asa the actual git repository on rails.sf.net. i currently (state of yesterday) rebuild the local repository with a new clone and was able to see the latest changes. I suspect that either something is still buggy inside the eclipse modules or sourceforges git implementation is not what it should be. Or that the setup itself is needing some more foolproofing :) Regards Martin -----Original-Nachricht----- > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > is now available.] > Date: Thu, 21 Jul 2011 11:46:42 +0200 > From: "Erik Vos" <eri...@xs...> > To: "'Development list for Rails: an 18xx game'" > <rai...@li...> > OK, I have installed Git for Windows and am running Git Bash. > > 'git status' says: > > ---------------------------------------- > # On branch master > # Your branch and 'origin/master' have diverged, > # and have 1 and 3 different commit(s) each, respectively. > # > # Changes not staged for commit: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) > # > # modified: data/1826/Game.xml > # modified: data/1870/Game.xml > # modified: rails/algorithms/NetworkTrain.java > # modified: rails/algorithms/RevenueAdapter.java > # modified: rails/algorithms/RevenueCalculator.java > # modified: rails/algorithms/RevenueCalculatorMulti.java > # modified: rails/algorithms/RevenueCalculatorSimple.java > # modified: rails/game/Train.java > # modified: rails/game/TrainI.java > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) # > # rails/algorithms/RevenueCalculatorMultiHex.java > no changes added to commit (use "git add" and/or "git commit -a") > ------------------------------------------------- > > 1. The "modified" files are Stefan's updates. Why are these marked as > "Changes not staged for commit"? Because these are in a branch? What > am I supposed to do? > > 2. What is the real status of the "Untracked" file > RevenueCalculatorMultiHex.java? This is the file for which Egit > showed a merge conflict. > Indeed the file icon is marked "?" so it's currently untracked. What > should I do? > > 'git push' says: > > ----------------------------------------------- > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to > 'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails' > To prevent you from losing history, non-fast-forward updates were > rejected Merge the remote changes (e.g. 'git pull') before pushing > again. See the 'Note about fast-forwards' section of 'git push > --help' for details. > Aborting > ---------------------------------------------- > > So I tried 'git pull', which says: > > ----------------------------------------------- > error: Your local changes to the following files would be overwritten > by merge: > data/1826/Game.xml > data/1870/Game.xml > rails/algorithms/NetworkTrain.java > rails/algorithms/RevenueAdapter.java > rails/algorithms/RevenueCalculator.java > rails/algorithms/RevenueCalculatorMulti.java > rails/algorithms/RevenueCalculatorSimple.java > rails/game/Train.java > rails/game/TrainI.java > Please, commit your changes or stash them before you can merge. > error: The following untracked working tree files would be overwritten > by merge: > rails/algorithms/RevenueCalculatorMultiHex.java > Please move or remove them before you can merge. > -------------------------------------------------- > > So it seems that Stefan's changes are already in my repository, but > are nevertheless in the way of pulling the very same changes into my > repository (again??). > > Before I start trying lots of other things: is there an easier way out > than to do it all over again, as Brett suggested? > > Erik. > > > > -----Original Message----- > > From: Erik Vos [mailto:eri...@xs...] > > Sent: Wednesday, July 20, 2011 11:47 PM > > To: 'Development list for Rails: an 18xx game' > > Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository > > is now available.] > > > > 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/rail >> > > > > > > s > > > >> > > > > > > >> > > > 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 > > > > > > > ---------------------------------------------------------------------------- > -- > > > 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 > > > > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC > can improve internal communications as well as offer faster, more > efficient ways to interact with customers and streamline customer > service. Learn more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > > |
|
From: Erik V. <eri...@xs...> - 2011-07-21 09:46:48
|
OK, I have installed Git for Windows and am running Git Bash.
'git status' says:
----------------------------------------
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 3 different commit(s) each, respectively.
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified: data/1826/Game.xml
# modified: data/1870/Game.xml
# modified: rails/algorithms/NetworkTrain.java
# modified: rails/algorithms/RevenueAdapter.java
# modified: rails/algorithms/RevenueCalculator.java
# modified: rails/algorithms/RevenueCalculatorMulti.java
# modified: rails/algorithms/RevenueCalculatorSimple.java
# modified: rails/game/Train.java
# modified: rails/game/TrainI.java
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# rails/algorithms/RevenueCalculatorMultiHex.java
no changes added to commit (use "git add" and/or "git commit -a")
-------------------------------------------------
1. The "modified" files are Stefan's updates. Why are these marked as
"Changes not staged for commit"? Because these are in a branch?
What am I supposed to do?
2. What is the real status of the "Untracked" file
RevenueCalculatorMultiHex.java? This is the file for which Egit showed a
merge conflict.
Indeed the file icon is marked "?" so it's currently untracked. What should
I do?
'git push' says:
-----------------------------------------------
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to
'ssh://evos:<password>@rails.git.sourceforge.net/gitroot/rails/rails'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
Aborting
----------------------------------------------
So I tried 'git pull', which says:
-----------------------------------------------
error: Your local changes to the following files would be overwritten by
merge:
data/1826/Game.xml
data/1870/Game.xml
rails/algorithms/NetworkTrain.java
rails/algorithms/RevenueAdapter.java
rails/algorithms/RevenueCalculator.java
rails/algorithms/RevenueCalculatorMulti.java
rails/algorithms/RevenueCalculatorSimple.java
rails/game/Train.java
rails/game/TrainI.java
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by
merge:
rails/algorithms/RevenueCalculatorMultiHex.java
Please move or remove them before you can merge.
--------------------------------------------------
So it seems that Stefan's changes are already in my repository, but are
nevertheless in the way of pulling the very same changes into my repository
(again??).
Before I start trying lots of other things: is there an easier way out than
to do it all over again, as Brett suggested?
Erik.
> -----Original Message-----
> From: Erik Vos [mailto:eri...@xs...]
> Sent: Wednesday, July 20, 2011 11:47 PM
> To: 'Development list for Rails: an 18xx game'
> Subject: Re: [Rails-devel] Git troubleshooting [was: Git repository is now
> available.]
>
> 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/rail
> > >> > > > s
> > >> > > >
> > >> > > > 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
>
>
>
----------------------------------------------------------------------------
--
> 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-21 08:34:24
|
For what it's worth: My idea about client/server was that both sides would parse the XML and thus would have access to all static (as opposed to dynamic) objects. Only the dynamic (state) info would be in the server only. Parsing at the client would been initiated by much simpler (and probably less) managers, probably not really worth that name. But I haven't really thought this through yet. BTW I was recently approached by a Dutch guy (Ruud Poutsma) who is developing a server game engine (for Settlers of Catan) that he thinks could be used generally. He had found the Rails site and insists that it could be useful to us. He is looking for assistance. All his mails were in Dutch, so it's no use to forward these. I have told him that I do not want to work on his project personally, and that he should write it up in English so I could forward it to the group. He has not done that yet. Anyway, here is the link to his code: https://github.com/generateui/OpenSettlers/tree/master/src/java/soc/common/server Erik. > -----Original Message----- > From: brett lentz [mailto:bre...@gm...] > Sent: Thursday, July 21, 2011 8:09 AM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Game Notes (was: Git repository is now available.) > > Yup, that sounds like it might be necessary if one of the existing *Managers > isn't a good fit. > > I'm trying to look ahead to our dream of client/server separation where I > expect the server will handle all the XML reading and pass it's authoritative > information to the client. In this case, the client side will need to be able to > instantiate objects without calling the > ConfigureFromXML() methods in each of the *Managers. > > So, if your implementation of new *Managers involves new > ConfigureFromXML() methods, I'd like to suggest this may be the time to > work on an alternative initialization methodology. It seems that > GameInfoParser might be part of the solution, but I'm not certain. > > Unravelling the current game init code is taking me more time than I like. > > ---Brett. > > On Wed, Jul 20, 2011 at 10:20 PM, Stefan Frey <ste...@we...> wrote: > > step by step ;-) > > > > OK: I will fix the initialization issues on my own (most likely by > > introducing TokenManager and SpecialPropertyManager that store the > > previously static class > > variables) . > > Stefan > > > > On Thursday, July 21, 2011 06:46:05 am brett lentz wrote: > >> That's progress! :-) > >> > >> If you've got time, feel free to fix the issues. It sounds like > >> you'll be able to get to it before I do. I don't want to force you to > >> wait for me if these issues are hindering you from moving forward > >> > >> I think I've got most of the basic ideas implemented (albeit > >> imperfectly) for this stage. So, bugfix away. > >> > >> ---Brett. > >> > >> On Wed, Jul 20, 2011 at 9:43 PM, Stefan Frey <ste...@we...> > wrote: > >> > Brett, > >> > back to Rails issues: > >> > > >> > * The game notes show up again, but new game still stops with > >> > NullPointerException errors. It occurs only if the option pane is > >> > expanded. 18xx log reports that the options are not set correctly. > >> > > >> > * The automated game tests work again but only for the first. The > >> > second and following runs fail automatically with Java exceptions, > >> > as the static class variables inside Token are not initialized > >> > again (this is especially true for TokenMap). > >> > Do you still intend to fix that or do you prefer to let me have a > >> > look at this as you already have to cope with my mistakes with git? > >> > Fixing the automated tests has a high priority on my todo list. > >> > > >> > Stefan > >> > > >> > On Tuesday, July 19, 2011 10:28:28 pm brett lentz wrote: > >> >> 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 > >> >> > >> >> ------------------------------------------------------------------ > >> >> ------ > >> >> --- --- 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 > >> > > >> > ------------------------------------------------------------------- > >> > ------ > >> > ----- 5 Ways to Improve & Secure Unified Communications Unified > >> > Communications promises greater efficiencies for business. UC can > >> > improve internal communications as well as offer faster, more > >> > efficient ways to interact with customers and streamline customer > >> > service. Learn more! > >> > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > >> > _______________________________________________ > >> > Rails-devel mailing list > >> > Rai...@li... > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel > >> > >> --------------------------------------------------------------------- > >> ------ > >> --- 5 Ways to Improve & Secure Unified Communications Unified > >> Communications promises greater efficiencies for business. UC can > >> improve internal communications as well as offer faster, more > >> efficient ways to interact with customers and streamline customer > >> service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > >> _______________________________________________ > >> Rails-devel mailing list > >> Rai...@li... > >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ---------------------------------------------------------------------- > > -------- > > 5 Ways to Improve & Secure Unified Communications Unified > > Communications promises greater efficiencies for business. UC can > > improve internal communications as well as offer faster, more > > efficient ways to interact with customers and streamline customer service. > Learn more! > > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications Unified > Communications promises greater efficiencies for business. UC can improve > internal communications as well as offer faster, more efficient ways to > interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: brett l. <bre...@gm...> - 2011-07-21 06:09:58
|
Yup, that sounds like it might be necessary if one of the existing *Managers isn't a good fit. I'm trying to look ahead to our dream of client/server separation where I expect the server will handle all the XML reading and pass it's authoritative information to the client. In this case, the client side will need to be able to instantiate objects without calling the ConfigureFromXML() methods in each of the *Managers. So, if your implementation of new *Managers involves new ConfigureFromXML() methods, I'd like to suggest this may be the time to work on an alternative initialization methodology. It seems that GameInfoParser might be part of the solution, but I'm not certain. Unravelling the current game init code is taking me more time than I like. ---Brett. On Wed, Jul 20, 2011 at 10:20 PM, Stefan Frey <ste...@we...> wrote: > step by step ;-) > > OK: I will fix the initialization issues on my own (most likely by introducing > TokenManager and SpecialPropertyManager that store the previously static class > variables) . > Stefan > > On Thursday, July 21, 2011 06:46:05 am brett lentz wrote: >> That's progress! :-) >> >> If you've got time, feel free to fix the issues. It sounds like you'll >> be able to get to it before I do. I don't want to force you to wait >> for me if these issues are hindering you from moving forward >> >> I think I've got most of the basic ideas implemented (albeit >> imperfectly) for this stage. So, bugfix away. >> >> ---Brett. >> >> On Wed, Jul 20, 2011 at 9:43 PM, Stefan Frey <ste...@we...> wrote: >> > Brett, >> > back to Rails issues: >> > >> > * The game notes show up again, but new game still stops with >> > NullPointerException errors. It occurs only if the option pane is >> > expanded. 18xx log reports that the options are not set correctly. >> > >> > * The automated game tests work again but only for the first. The second >> > and following runs fail automatically with Java exceptions, as the >> > static class variables inside Token are not initialized again (this is >> > especially true for TokenMap). >> > Do you still intend to fix that or do you prefer to let me have a look at >> > this as you already have to cope with my mistakes with git? Fixing the >> > automated tests has a high priority on my todo list. >> > >> > Stefan >> > >> > On Tuesday, July 19, 2011 10:28:28 pm brett lentz wrote: >> >> 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 >> >> >> >> ------------------------------------------------------------------------ >> >> --- --- 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 >> > >> > ------------------------------------------------------------------------- >> > ----- 5 Ways to Improve & Secure Unified Communications >> > Unified Communications promises greater efficiencies for business. UC can >> > improve internal communications as well as offer faster, more efficient >> > ways to interact with customers and streamline customer service. Learn >> > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> --------------------------------------------------------------------------- >> --- 5 Ways to Improve & Secure Unified Communications >> Unified Communications promises greater efficiencies for business. UC can >> improve internal communications as well as offer faster, more efficient >> ways to interact with customers and streamline customer service. Learn >> more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient ways > to interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
|
From: Stefan F. <ste...@we...> - 2011-07-21 05:18:06
|
step by step ;-) OK: I will fix the initialization issues on my own (most likely by introducing TokenManager and SpecialPropertyManager that store the previously static class variables) . Stefan On Thursday, July 21, 2011 06:46:05 am brett lentz wrote: > That's progress! :-) > > If you've got time, feel free to fix the issues. It sounds like you'll > be able to get to it before I do. I don't want to force you to wait > for me if these issues are hindering you from moving forward > > I think I've got most of the basic ideas implemented (albeit > imperfectly) for this stage. So, bugfix away. > > ---Brett. > > On Wed, Jul 20, 2011 at 9:43 PM, Stefan Frey <ste...@we...> wrote: > > Brett, > > back to Rails issues: > > > > * The game notes show up again, but new game still stops with > > NullPointerException errors. It occurs only if the option pane is > > expanded. 18xx log reports that the options are not set correctly. > > > > * The automated game tests work again but only for the first. The second > > and following runs fail automatically with Java exceptions, as the > > static class variables inside Token are not initialized again (this is > > especially true for TokenMap). > > Do you still intend to fix that or do you prefer to let me have a look at > > this as you already have to cope with my mistakes with git? Fixing the > > automated tests has a high priority on my todo list. > > > > Stefan > > > > On Tuesday, July 19, 2011 10:28:28 pm brett lentz wrote: > >> 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 > >> > >> ------------------------------------------------------------------------ > >> --- --- 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 > > > > ------------------------------------------------------------------------- > > ----- 5 Ways to Improve & Secure Unified Communications > > Unified Communications promises greater efficiencies for business. UC can > > improve internal communications as well as offer faster, more efficient > > ways to interact with customers and streamline customer service. Learn > > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > --------------------------------------------------------------------------- > --- 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient > ways to interact with customers and streamline customer service. Learn > more! http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: Stefan F. <ste...@we...> - 2011-07-21 05:15:25
|
Erik,
I have only checked the methods that train and TrainType support instead of
having a look at the xml files ;-)
I intend to keep it as closely to your current specification. So I agree with
your proposal. Considering your specification I only wonder why major and
minor are an attribute of the TrainType tag instead of Reach?
Maybe to keep the xml files more compact?
The only change will be that there is an additional hexes attribute inside of
the TrainType tag, which should be used for hex trains.
This attribute allows the separation of name and range (thus the hex train in
1844 will be defined with a hexes attribute one less than their name).
Some implementation questions:
The main task is to add methods to support the variables and I will to that.
Just to be sure I understood your recent changes:
TrainCerticate: One for each certificate
TrainType: One for each type
Train: One per train certificate (standard case), two per train certificate
(dual case)
Train objects have a pointer to the TrainType object, which itself contains
all relevant attributes required for the revenue calculation.
For the case of operating I can safely ignore the dual case as the operating
company has the correct trains in its portfolio.
So I retrieve all trains for a company from the portfolio and for each train
get its TrainType and then query the TrainType for the attributes.
To make this more transparent I suggest to remove all methods related to range
etc. from the Train class (and TrainI interface) and only keep those in
TrainType. I currently sometimes query the Train and sometimes the TrainType
and this seemed somehow inconsistent.
Stefan
On Wednesday, July 20, 2011 10:52:02 am Erik Vos wrote:
> 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
>
> ---------------------------------------------------------------------------
> --- 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-21 04:46:32
|
That's progress! :-) If you've got time, feel free to fix the issues. It sounds like you'll be able to get to it before I do. I don't want to force you to wait for me if these issues are hindering you from moving forward I think I've got most of the basic ideas implemented (albeit imperfectly) for this stage. So, bugfix away. ---Brett. On Wed, Jul 20, 2011 at 9:43 PM, Stefan Frey <ste...@we...> wrote: > Brett, > back to Rails issues: > > * The game notes show up again, but new game still stops with > NullPointerException errors. It occurs only if the option pane is expanded. > 18xx log reports that the options are not set correctly. > > * The automated game tests work again but only for the first. The second and > following runs fail automatically with Java exceptions, as the static class > variables inside Token are not initialized again (this is especially true for > TokenMap). > Do you still intend to fix that or do you prefer to let me have a look at this > as you already have to cope with my mistakes with git? Fixing the automated > tests has a high priority on my todo list. > > Stefan > > On Tuesday, July 19, 2011 10:28:28 pm brett lentz wrote: >> 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 >> >> --------------------------------------------------------------------------- >> --- 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 > > ------------------------------------------------------------------------------ > 5 Ways to Improve & Secure Unified Communications > Unified Communications promises greater efficiencies for business. UC can > improve internal communications as well as offer faster, more efficient ways > to interact with customers and streamline customer service. Learn more! > http://www.accelacomm.com/jaw/sfnl/114/51426253/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
|
From: Stefan F. <ste...@we...> - 2011-07-21 04:41:41
|
Brett, back to Rails issues: * The game notes show up again, but new game still stops with NullPointerException errors. It occurs only if the option pane is expanded. 18xx log reports that the options are not set correctly. * The automated game tests work again but only for the first. The second and following runs fail automatically with Java exceptions, as the static class variables inside Token are not initialized again (this is especially true for TokenMap). Do you still intend to fix that or do you prefer to let me have a look at this as you already have to cope with my mistakes with git? Fixing the automated tests has a high priority on my todo list. Stefan On Tuesday, July 19, 2011 10:28:28 pm brett lentz wrote: > 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 > > --------------------------------------------------------------------------- > --- 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: brett l. <bre...@gm...> - 2011-07-21 04:40:00
|
On Wed, Jul 20, 2011 at 9:30 PM, Stefan Frey <ste...@we...> wrote:
> However I got those error messages on pushing my master to the repository so I
> tried for the branch instead and this worked immediately.
> I was surprised by that myself and I admit that I do not know yet how to
> delete the branch from the remote repo. (Selecting delete branch of the remote
> repo in the git repo explorer seems to remove only my local reference, but
> does not delete the remote branch itself. I have no idea to push this delete
> to the remote repo.)
>From the CLI it's:
$ git push origin :remote_branch
Basically, "push nothing into the remote_branch on origin"
>
> As for subversion I usually prefer using command line tools as it is more
> transparent, but I made the experience that using command line tools (for
> other reasons) can confuse Eclipse.
>
> Hopefully Brett can sort this out.
Sure thing. I'll merge your branch into master, then delete the remote branch.
> Stefan
>
---Brett.
> On Wednesday, July 20, 2011 11:11:13 pm Erik Vos wrote:
>> 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
>
> ------------------------------------------------------------------------------
> 5 Ways to Improve & Secure Unified Communications
> Unified Communications promises greater efficiencies for business. UC can
> improve internal communications as well as offer faster, more efficient ways
> to interact with customers and streamline customer service. Learn more!
> http://www.accelacomm.com/jaw/sfnl/114/51426253/
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
|
|
From: Stefan F. <ste...@we...> - 2011-07-21 04:28:31
|
Erik:
I am sorry for that.
I tried to follow the workflow that (at least seemed) to me was recommended
for git (branch out for a new feature). I even kept it simple to use only one
commit instead of several ones and then rebasing.
However I got those error messages on pushing my master to the repository so I
tried for the branch instead and this worked immediately.
I was surprised by that myself and I admit that I do not know yet how to
delete the branch from the remote repo. (Selecting delete branch of the remote
repo in the git repo explorer seems to remove only my local reference, but
does not delete the remote branch itself. I have no idea to push this delete
to the remote repo.)
As for subversion I usually prefer using command line tools as it is more
transparent, but I made the experience that using command line tools (for
other reasons) can confuse Eclipse.
Hopefully Brett can sort this out.
Stefan
On Wednesday, July 20, 2011 11:11:13 pm Erik Vos wrote:
> 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
|
99 messages has been excluded from this view by a project administrator.
