Is it possible for git merge to ignore line-ending differences? Maybe I'm asking the wrong question ... but: I tried uisng config.crlf input but things got a bit messy and out of control, specially when I applied it after the fact. For one thing, applying this config after the fact doesn't seem to affect files that were committed to t...
I like TortoiseSVN's windows integration, Is there something like that for dealing with git-svn? I'd even go with a less integrated GUI if it is quick enough to access. What I don't want is a CLI as I rarely would have a command prompt sitting in the correct directly. This is a related question but for Linux ...
I've been playing around with git at home and I really like the idea of local commits. Being able to commit smaller changes without spreading my potentially broken code to everyone is nice, as well as being able to revert smaller changes because of the more frequent commits. I've been reading about the git-svn command, but I'm not sure ...
Hi, I have started to use git-svn for some of my work to be able to do local commits. This works great for projects that use standard svn layout. Recently I started working on a Java project that is split into multiple connected modules (20-25), and each module have its own root folder in the same svn repo with its own trunk/branches/ta...
I'm using git-svn; I typically create a topic branch, make commits to it, then checkout master, git svn rebase, git merge --squash topic_branch, git commit -m "summary comment", then git svn dcommit. That works fine, but git doesn't seem to know I merged the branch changes into master. I tried this without svn involved: # Make a reposi...
Currently I'm using the following SVN clients: TortoiseSVN for Windows and AnkhSVN for Visual Studio 2005+. I heard that GIT has a great level of interoperability with SVN. Would my tools work with a GIT repository? ...
My typical git-svn workflow is: git checkout -b story-xyz git commit -a -m "work" git commit -a -m "more work" git checkout master git svn fetch git merge remotes/trunk git checkout story-xyz git rebase master (sometimes with -i) git checkout master git merge story-xyz At this point I have my master and story-xyz branches pointing to ...
We have an SVN setup with stable trunk and unstable development branch. Dev work is (mostly) done on the branch and then merged to trunk before deployment. I use git-svn as my SVN client. My merge process from unstable to trunk is as follows: git svn fetch git co -b trunk svn/trunk git merge --no-ff svn/unstable git svn dcommit svn...
We use SVN here at the office and I'm experimenting with using git-svn for myself. I created a directory in /usr/local/code/git and did my checkout to /testco. I used the commands given in the man page, git svn clone , where is my repo. It goes through a few hundred lines of all the files in the SVN trunk, but when its done the direc...
I have a project in SVN which has a plugins folder. Several of the plugins folders are git repositories -- I added them to my plugins folder using git clone. This has been working well for me but now I'm looking to migrate my SVN repository to git using git-svn: git svn init http://path/to/my/repo --no-metadata git config svn.authors...
Well.. I did some headless committing and merging and now I am deep in the .... Here's what I did: fetched trunk with git-svn branched off work git commit ed stuff to work git svn dcommit ted the cnanges to svn, (yes, this i where it gets interesting) git checkout master git merge work In this situation, git doesn't seem to understa...
I'm using git-svn and there are IDE project files in the svn repository. Everytime I start my IDE it modifies project files a bit and they are marked as changed in the status display. And then if I try to do a git svn rebase to update my working tree to have the latest changes from the svn it fails as I have local modifications on the pr...
I have a number of locally committed patches in my git-svn repo which I haven't yet commited to our svn repo. A normal "git svn dcommit" will commit all of these patches to svn. I would like to commit only some of my patches (simple bug fixes), but not others (untested major changes). How can I do this with git svn? ...
I was just checking out git-svn and thought I would give it a try with one of my existing repository. When I ran git-svn I got this error. Couldn't open a repository: Unable to open an ra_local session to URL: Unable to open repository '{MyFilePath}': Expected FS format '2'; found format '3' at C:/Program Files/Git/bin/git-svn line 13...
I use git svn to track a SVN repo. When I try to do a git svn rebase I am getting this error: Incomplete data: Delta source ended unexpectedly This is a large repo, with a long history. Just fetching the original single revision took almost 90mins, so I don't want to reclone. Are there any ways to track down which file is causing t...
SVN permits the ability to update an old commit message via hook. How can I go about updating my git-svn copy's version of the commit message? The only reference I could find was a bug report requesting this feature about a year ago on debian.org. Is this possible in the current version of Git v1.6.3.*? If not, what's the most intellig...
I have a project in SVN and I tried to clone it with git-svn. I followed the example in the git-svn docs. git svn clone svn+ssh://host/path/trunk project_name The command completed with no error msg, but the cloned project does not contain all the directories as the project in SVN. At the top level, my SVN project has... $ svn ls ...
I have a subversion repository hosted on Linux but only ever accessed via windows clients as it's for the source of a large Windows application. It would be awesome if I could work on this repository using git-svn (provided by msysgit). I'm having a heck of a time trying to get the repository to not get itself in a jam over the windows...
Currently I go into phpMyAdmin, export my database as a text file and then save it with the application files before I commit things to svn (or git). Then of course, I've got to import it to production. Is there a better way? ...
I've never seen this one before. I'm creating a development on a new Mac by cloning several svn repositories to local git repositories. Several pulled just fine, but one is being stubborn. They're all being pulled from the same svn server and there are no differences that I know of. I've tried to clone this one particular repository 4 ti...