Hi guys! I would like to know if there is a solution (open source project or webservice) available that offers a svn or git repository together with an apache server and database. I am searching for such a solution because I would like to get the benefits of developing with a subversion system. On the other side I need a preview of the f...
There is an internal SVN repository on which many changes have been made. This contains not only the project of interest, but also many other folders. There is an external git repository, on which many changes have now been applied. What is the best way to merge these 2 sets of changes. I was thinking, take the diff of the git HEAD an...
I have got a central SVN repository I must commit to, but I've got a passion for git (like any other developer I know). The case is well known. Then I read about git-svn and gave it a try. Since I don't need the full history, just from two months or so, I did like this: git svn clone -r 34000 -s https://svn.ourdomain.com/svn/repos/Proj...
I've been using TortoiseSVN on Windows for years with local filesystem repositories for my own projects. I'm planning to start collaborating with a friend on one of the projects, and will be shifting the repository to my own website. I've read a lot of "git beats SVN!" posts over the last couple years, and figured I ought to at least s...
I have a problem with a SVN branch. I made a checkout of it with git checkout -t -b stable svn/stable. Then I did a merge with git rebase master. After that I tried to commit the merge changes into the remote branch with git svn dcommit But now it seems, that Git pushed the changes into the trunk instead of the branch :( And git status...
I have an Svn repository at http://svn.domain.com/project that is structured as follows: trunk/ build_file_1.xml build_file_2.xml project_root/ branches/ cc2.10/ cc3.00/ .. cc3.5/ jira-labs-39/ tags/ studio-2.10.0.0/ studio-2.10.0.1/ ... studio-3.4.1.0/ I want to clone the trunk and branches, but I'm only getti...
We have multiple teams working on a common svn repository. Is there a way to have one of the teams to work on git and other teams continue using svn. What I like to do is have a shared (central) git repository for one of the "GIT" team (multiple developers). The "GIT" team Developers clone from shared git repository to dev. machines and...
The advantages of using git-svn over git are obvious(svn compatibility), but what are the advantages of git over git-svn? ...
I've got a question that most likely doesn't have a unique and clear answer. In the team we are using the SVN, many of the people are using the git-svn (treating it as a fancy SVN client). We're storing some project related publications, reports, documents in the repository under let's say trunk/Documents/*. Each of the users creates h...
I'm using msysgit on windows on old repo i had no problems with this command git svn clone -s --username=XXX https://URL but repo has moved and now the url is like that: svn://URL:port how can i set this port number ? using git svn clone svn://URL:port results with 'mkdir ... not a directory' error, and without port it can't find ...
I replaced a folder and all its contents with a symlink. That is removed the folder and added a symlink, in a single git commit. Git commit happened normally. However when I try to push to the upstream svn, it complains that the file exists. Now, how do I amend my commit to not contain the git add of the new symlink and make it a new c...
I have a SVN repository and I used: git svn clone <svn url> I have also created a repository on github. So every time I push the changes to github I would also commit the changes back to SVN. git svn dcommit Everything worked fine until my harddisk crashed. Now I need to restore a working copy of my source code. I can think of two...
I checked out a git clone of the svn repo. Some how, git checked in the .svn files into the repo. I was only working on the git locally; so no problem. But I cant update any other svn repo anymore. Even when I git svn clone the entire folder, I don't get the .svn folders. So, how do I delete them? ...
I can't svn up or commit. :( There is a svn centrally and I use git locally using git-svn. Basically, somehow, I added a folder that had .svn folders into the git and committed it to svn. Both git and central svn happily committed the .svn as the content folder, without complaining. Now, I can't svn up to the existing folder as, once ...
I am new to Git and have the newb following dilemma. I moved my old svn repo to github initially by just initializing a repository full of the files from my svn repository (minus the .svn stuff). Then, later I read that I could import my svn history, maintaining the history. So I deleted all contents of my master branch on github and ...
I created a topic branch from the master; made some commits. Then checked out the master; rebased it on the svn and merged the topic branch. There were no commits on the master itself, so the merge was fast-forward. Now, when I try to svn dcommit it gives me merge conflicts! wtf? Clearly there is a linear history on the master. The w...
Yea, right. I use git (with git-svn) on linux and a colleague uses svn on windows. So many times, git reports whitespace issues. In fact it fails to commit a linear history because of these problems and creates merge conflicts. What is the simplest way to configure svn/git and git-svn on windows and linux so that there are now whitesp...
I have a working svn of my own project in my local machine. I have created a account in Github. Now I want to transfer this svn to Github with all commit logs and history. ...
I'm trying to migrating a svn repository to another git repository. I read all the documents as well. But they are talking about how to migrate a svn repository to a NEW git repostory. What I want to do is let the svn repository as a part of the old git repository with the svn log. I have a git repository and a svn repository Files in ...
Is there a way to create a local branch, or modify an existing local branch, in such a way that it cannot be dcommit'ed to the svn repo? Here's a description of the scenario. git checkout -b local.farBranch remotes/farBranch git checkout -b patched.local.farBranch git merge local.patches <work on patched branch && test> <do not commit...