From: Stefan F. <ste...@we...> - 2011-07-20 11:37:09
|
Erik: thanks for the help. I am getting close to what I intended, but I am not there yet. Actually I had to use the push uri: ssh://{username}@rails.git.sourceforge.net/gitroot/rails/rails Using the git protocol was not possible, as egit complained that it does not support a username. I prefer not to use the synchronize perspective with git, as I wonder what it actually shows, as there are now two states of changes (changes not committed, changes committed but not pushed yet). So my intended workflow to implement a new feature was: A) Create a branch for that feature locally by cloning my local master which is itself a clone of the remote master. B) Commit the changes in the local branch. C) Push/merge those changes into my local master. D) Push the changes from the local master into the remote master. Unfortunately I was not able to push the changes to the master branch, I got a rejected error message for this (both on dry run and real). But my local master is up-to-date with the repo master. However I was able to push my branch H_train into the repo and was able to push my committed changes there. My ref spec for the push to the master is: refs/heads/master:refs/heads/master What have I done wrong? Maybe it is better to wait for Brett to help here, I do not want to break anything and he has daily working knowledge with git. Stefan On Wednesday, July 20, 2011 11:12:44 am Erik Vos wrote: > See below for my findings > > > -----Original Message----- > > From: Stefan Frey [mailto:ste...@we...] > > > > Brett or Erik: > > I believe I am doing something wrong or something is not setup correctly, > > but > > > I do not get the push working after the commit. > > > > I did setup a complete new workspace for git, cloned remote, changed , > > committed, then pushed to remote. > > All steps worked, except the final push. > > I did the same thing, and it all appears to have worked. I'm not happy > with the way Egit reports a successful push: the synchronization view is > not updated (unlike Subversive, which cleaned up that view after a > commit). Basically I have to conclude success from the absence of error > messages; I would have preferred some positive message. > > > The error message I get is that the push is not permitted. > > > > My thoughts are: > > > > I have not setup a specific push-URI, only used the sourceforge link > > git://rails.git.sourceforge.net/gitroot/rails/rails > > Same as I did, except that I had inserted my username, as per the Egit help > info (git://ev...@ra.../gitroot/rails/rails). I wonder: > could and should I also insert my password? Now I'm asked to type my > Sourceforge password *every* time I access remote (Subversive only required > it once per Eclipse session). I could not find a place to configure that > either. > > > During the clone the fields for authentication were grayed out. > > Can't remember. > > > During the push I never got asked for my user-account or password on > > sourceforge. > > I think I was asked for my password only, as I had included mu username in > the URL. > > > I was not able to locate anywhere in all those Eclipse dialogs where I > > might be > > > able to setup my account. > > The only place I found was in the Push Wizard (Team|Remote|Push), but I > haven't used the Custom part of that either. > > > Could you please provide help? > > Unfortunately I can't speak the final word on this matter. Let's together > try to find what works best. > > Erik. > > > --------------------------------------------------------------------------- > --- 10 Tips for Better Web Security > Learn 10 ways to better secure your business today. Topics covered include: > Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, > security Microsoft Exchange, secure Instant Messaging, and much more. > http://www.accelacomm.com/jaw/sfnl/114/51426210/ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel |