[git-users] GIT-SVN: rebase vs. fetch, rebase against a particular revision
I'm working in an environment, where the primary version control system is SVN. The setup is such that when something is commited to SVN, a build is scheduled. When the build server is idle, it takes the current SVN HEAD revision (which may be different from the one that caused the build to be scheduled), and tries to build. If successful, it drops the built binary into some archive directory, and goes back to idle (or starts a new build, if one is scheduled). So there exists a log of all buildable revisions somewhere. I would like to setup a GIT repository against our SVN that works as a downstream only repository (GIT pulls from SVN, but does never accept commits from users, and never pushes changes back into SVN). I would like to update this GIT repository only to the latest buildable revision in SVN (i.e. determine the latest buildable SVN revision, and then update the GIT repo to that SVN revision). The way that I have gotten this to work is, in a nutshell: 1. clone SVN-GIT 2. run cronjob to update GIT: 2.1 get latest buildable revision number R 2.2 git svn fetch -r R My problem with this setup is that the individual SVN commits are lost on 'git svn fetch'. Instead of 'git svn fetch -r revision', I would actually like to do either 'git svn rebase -r revision', but this does not work (rebase only works against SVN HEAD?). Another approach to solving the problem might then be to run the fetch in a loop for every single SVN commit up to (and including) the latest buildable revision, i.e.: 2. run cronjob to update GIT: 2.1 get latest buildable revision number R 2.2 determine last SVN revision B pulled into GIT 2.3 for each SVN revision R' from B (excluding) to R (including): git svn fetch -r R' As I am new to using GIT, I would like to know if this is a correct assessment of the situation. Are there any other approaches? BR Matthias --
Re: [git-users] Re: git.for solo developer
On Thu, Dec 20, 2012 at 9:38 AM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Wednesday, December 19, 2012 9:30:24 PM UTC+1, Dimitris Papageorgiou wrote: Do you think git would be useful for a solo developer as I am right now? I am developing a web app alone-no other developers. VCS is always useful kind of aid for a developer. But I think Git is intended more for teams of developers that wotk on the same project so that they can take advantage of Git's distributed functionality. I am asking these things because I am complete beginner in Git and in general to version control systems Git works awesomely for solo projects. Just git init and you're up and running. Here's a starter's guide: http://rogerdudler.github.com/git-guide/ I absolutely agree with this. git is great for solo developers, particularly if you hook up to github or equivalent. That way losing a disk or having equipment stolen is not so dramatic. Even just having the ability to compare between revisions and manage different branches of development makes git very powerful. When my teenage kids started programming, the first thing I did with them was get them to sign up to github and get into the habit of using git. Nothing in programming is more tragic than having something work, then make a few benign changes which screws everything up. git helps with that -- CHarles --
Re: [git-users] How to install git on CentOS5 without root access?
On Thu, Dec 20, 2012 at 2:35 PM, Andy Hardy a...@hardyfamily.org.uk wrote: On 20/12/2012 18:00, Eric B wrote: [eric git]$ git clone https://e...@git.assembla.com/myproj.git Cloning into 'myproj'... Password for 'https://e...@git.assembla.com https://e...@git.assembla.com/': error: RPC failed; result=22, HTTP code = 401 fatal: The remote end hung up unexpectedly HTTP 401 is an 'unauthorized' message, it sounds like user 'eric' doesn't have authority to clone https://git.assembla.com/myproj.git. Perhaps the wrong password or that user simply isn't allowed to access that repository? No - password is correct and user has access rights (have tried multiple times to ensure no typos) and it works fine from my local desktop. A wrong password also returns a different msg: fatal: Authentication failed So authentication passes. I presume there is something that I am missing or don't have configured right in git, but have no idea what... Tx! Eric --
Re: [git-users] How to install git on CentOS5 without root access?
On Thu, 20 Dec 2012 15:10:44 -0500 Eric Benzacar e...@benzacar.ca wrote: HTTP 401 is an 'unauthorized' message, it sounds like user 'eric' doesn't have authority to clone https://git.assembla.com/myproj.git. Perhaps the wrong password or that user simply isn't allowed to access that repository? No - password is correct and user has access rights (have tried multiple times to ensure no typos) and it works fine from my local desktop. A wrong password also returns a different msg: fatal: Authentication failed So authentication passes. I presume there is something that I am missing or don't have configured right in git, but have no idea what... Do you have tcpdump or tcpflow installed on that system? It would be interesting to sniff the traffic to really see what happens. On the other hand, that would require using plain HTTP, not HTTPS, and this might be not possible. --
Re: [git-users] How to install git on CentOS5 without root access?
On Thu, 20 Dec 2012 15:10:44 -0500 Eric Benzacar e...@benzacar.ca wrote: [eric git]$ git clone https://e...@git.assembla.com/myproj.git Cloning into 'myproj'... Password for 'https://e...@git.assembla.com https://e...@git.assembla.com/': error: RPC failed; result=22, HTTP code = 401 fatal: The remote end hung up unexpectedly HTTP 401 is an 'unauthorized' message, it sounds like user 'eric' doesn't have authority to clone https://git.assembla.com/myproj.git. Perhaps the wrong password or that user simply isn't allowed to access that repository? No - password is correct and user has access rights (have tried multiple times to ensure no typos) and it works fine from my local desktop. A wrong password also returns a different msg: fatal: Authentication failed So authentication passes. I presume there is something that I am missing or don't have configured right in git, but have no idea what... One more thing, try also setting GIT_CURL_VERBOSE=1 before running your `git clone` encantation? Git uses libcURL to implement HTTP[S] transports, and this variable should make cURL chatty about what it does. --
Re: [git-users] Re: git.for solo developer
I feel really sorry about this off-topic ,but I loved this message ,thank you Charles Manning. JoeCabezas: When my kids started programming, the 1st thing I did with them was get them to sign up to #github and get into the habit of using git 3 Original Tweet: http://twitter.com/JoeCabezas/status/282092609411878913 Sent via TweetDeck (www.tweetdeck.com) --
Re: [git-users] How to install git on CentOS5 without root access?
From: Eric B ebenza...@gmail.com [eric git]$ git clone https://e...@git.assembla.com/myproj.git Cloning into 'myproj'... Password for 'https://e...@git.assembla.com': error: RPC failed; result=22, HTTP code = 401 fatal: The remote end hung up unexpectedly In all fairness, I do not know if that is due to my package being installed under my home dir vs standard dirs, or if there is a firewall issue/etc, but I can confirm that a clone to that repo works properly on another system. Similarly, I can confirm that I can d/l data from other https sites without issues. The odds are very good that Git itself is working fine on the production machine, and that it's able to contact the remote system. The trouble is that the remote system doesn't like the HTTP request, probably because it doesn't think your end has authenticated itself correctly. A less-likely cause would be that Git isn't making the request properly, and a web proxy (or elaborate firewall) is intercepting the request and denying it. Can you manually make the same HTTP request work? wget is a good tool for that. Of course, you have to find out what URL is actually being fetched, although a fetch of / will get you some information. If you use an http: URL for the repository and snoop the network traffic, you can find the URL used in the HTTP request. (You can do that on your development system.) Or get it with GIT_CURL_VERBOSE=1, as Konstantin suggests. Dale --
Re: [git-users] Pushing symbolic references to remote repositories?
From: Dun Peal dunpea...@gmail.com Is there a clean and reliable way to do that, or are symbolic references just not meant to be shared? I may be well wrong, but my impression is that symbolic references are like branch names, in that they aren't things that can be pushed or pulled between repositories, they have to be installed in each repository separately. Only commits and their dependent objects can be pushed/pulled. Objects that are, essentially, *pointers to commits*, can't be. Dale --
[git-users] File diff shows up as single line
I have two files in my repository that started showing up as single lines. How do I fix this? The files show up fine in Eclipse and other editors. Here is what git-gui shows me. @@ -1 +1 @@ -cffunction name=table_data_inputcfargument name=label required=yescfargument name=bindto required=yes . \ No newline at end of file +cffunction name=table_data_inputcfargument name=label required=yescfargument name=bindto required=yes . \ No newline at end of file *Environment:* Windows 7 Git-gui 0.17.gitgui git 1.8.0.msysgit.0 --
[git-users] Re: File diff shows up as single line
On Friday, December 21, 2012 6:07:09 PM UTC-5, Aaron Woehler wrote: I have two files in my repository that started showing up as single lines. How do I fix this? The files show up fine in Eclipse and other editors. Mixing unix and windows files? Here is what git-gui shows me. @@ -1 +1 @@ -cffunction name=table_data_inputcfargument name=label required=yescfargument name=bindto required=yes . \ No newline at end of file +cffunction name=table_data_inputcfargument name=label required=yescfargument name=bindto required=yes . \ No newline at end of file Environment: Windows 7 Git-gui 0.17.gitgui git 1.8.0.msysgit.0 --
