I have a repository with a rails app in the production Server. In the repo there is the .gitignore file: ... config/database.yaml ... Every developing client have a cloned repo with different config/database.yaml. My problem is this: database.yaml is in .gitignore, then when I run git clone (on the server) the database.yaml wi...
Hello, I have a problem when I try to do a git svn rebase on my repository. It displays : Checksum mismatch: code/app/meta_appli/app_info.py expected: d9cefed5d1a630273aa3742f7f414c83 got: 4eb5f3506698bdcb64347b5237ada19f I searched a lot but haven't found a way to solve this problem. If anybody knows, please share your knowledg...
I'd like to replace my svn repository with git. Unfortunately I can't do this in one shot and to cut a long story short, I need to move an svn repository, with history, into a subdirectory of a pre-existing git repository. So I currently have: svn: svn1/ svn2/ git: git1/ .git/ gita/ And I want: svn: svn1/ git: git1/ .git/ ...
I'm new to git, coming from SVN world. So far, it seems a lot more useful, but I am still working out the kinks. Currently, my workflow is like this: make changes > git add . > git commit > enter log message What I don't understand is why I seem to have to add all of my files before I commit. They are under version control already? ...
I have a svn repository (with no TLB structure if it matters) which I want to use along with git. I can do a git-svn clone, work on my changes in the git repo and commit back to the svn repo whenever I am done. It's clear until this point. I'm not sure how to extend this workflow model to multiple developers. I need my dev team to be a...
I had a weird situation today.. I'll try and recreate what I think happened. I wanted to move a speculative change (made to a_file) to a new branch and continue working on the main branch without it. On master with a_file and b_file dirty I did: git checkout -b saved_feature git commit a_file -m "Putting this modification on a differ...
So I'm using git-svn to keep in sync with our main svn repo. I also have created a remote git repo to push branches for safekeeping off of my machine until the changes are ready to be merged into svn. The problem is when I have a commit that needs to go to both svn and git, I have to git svn dcommit first. dcommit rewrites the SHAs of c...
We recently moved from SVN to Git, but there's a single legacy branch that I need to bring in to the Git repository. The SVN and Git repositories are the same logical code (i.e. they're both called foo-lib), but the Git one has newer revisions from after we switched to Git. Is there a way we can use git-svn to grab the history of a spec...
What is the correct way to make the remote branches/tags that exist after a git-svn init/git-svn fetch into local Git branches/tags before pushing to my remote Git repo and abandoning SVN altogether. I have: Run git svn init Updated the svn-remote "svn" section of my .git/config file to the following: url = file:///Users/Developers/...
I've cloned a project's sources using Git, which is converted on the server from a SVN repo. The problem with this Git repository is that it lacks tags, branches, and some revisions are missing. The number of revisions is enormous (~20000) for me to use git-svn clone, and it'd be a waste of bandwidth and time as I already have most objec...
Hi Since Beanstalk began to support GIT their SVN deployments have slowed down drastically. Google is throwing up no results and having never setup anything similar to Beanstalk does anybody have any advice. At the moment Beanstalk handles the following: - SVN Hosting - Deployments (configurable for per commit or manual with varyin...
Hi, I created a mirror of an svn repository via git-svn. The first time I did fetch from svn, I got revisions 1-7001, which I pushed to the github. Now that there are 7007 revisions in svn, I did git-svn fetch, which appears to have downloaded the missing revisions, but: I can't see them in git log (last one is 7001) they don't get pu...
After converting my repository to Git using git-svn, I'm seeing both the original "master" commits and the merges of those commits into my stable branch both showing up on the stable branch. The log for that branch looks like this: commit 6e18557b8f7e7173d26df7dd1857362c27eb3ab1 Merge: e36cfba c8a400c Author: <author> Date: Fri Jun 25...
I have checked out a svn repository using git svn. Now I need to checkout one of the branches and track it. Which is the best way to do it? ...
I came to git via terminal, not github and I am wondering how I make a connection between the two. From a checkout I have, I created a branch in terminal by running this command: git checkout -b newbranchname From my understanding, github calls this forking. How do I connect the branch on my box to a fork of a checkout on github? (...
My .git folder disappears from times to times. The first time I thought that I had erase it by mistake, but this is the 3rd times it occurs, so there must be something. I use git-svn and cygwin over windows, it seems to occurs mostly after a PC restart, could it be something with rxvt, that could kill references to some folders ? I can't...
Hi all, I recently had a corrupted object in my repository, pointing on my HEAD (the object was empty) . It happened after interrupting a git-svn command. Then, I restored my repository by changing manually the refs on this object. Now, I want to synchronize my git repository with SVN, but git svn fetch returns: fatal: Invalid revisi...
I'm trying to convert an existing SVN repository to GIT using git-svn clone but versioned files with special characters in the filename like "ö" are showing as "ö" after migration. Obviously, git-svn saves the filenames "as is" - I assume that SVN stores filenames in UTF-8 (as done with the logs), but my Windows uses windows-1252 encodi...
Hi, a few months ago i configured a git with an svn repository. Until now i only used the svn repository to keep up-to-date with the supplied application on it. But now i also want to commit stuff back. To do this every feature i'm going to commit needs to be in a separate branch. I read about how you should create a new branch etc. But ...
When I clone our svn repo using git svn i pass it arguments to tell it where the head, branches, tags... etc are and it pulls the main code base properly. in addition to trunk and branches we also have directories for: the website, and one for 3rd-party apps the build system a bunch of others. How do I get git-svn to pull these a...