Tagged Questions
0
votes
0answers
14 views
Create a warning when rebasing master
I'm wondering if it is possible to create a warning to prevent me from rebasing my local master branch.
I work on a project managed with svn, but I interact with the repository with git. My local ...
-1
votes
0answers
24 views
Fixing branches disconnected from master
After "completing" a repository migration, we noticed that all of our branches are all behind and ahead of master by hundreds to thousands of commits.
Some context -- originally I used git-svn to ...
23
votes
5answers
13k views
Importing SVN branches (and tags) on git-svn
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 ...
0
votes
1answer
35 views
GIT How to clean history pack for old deleted files?
I imported a very old SVN project, with git svn clone.
The problem was that I picked up the root folder of that repo, where I already had imported all other sub-projects (into new git repos), and each ...
0
votes
1answer
36 views
Versioning Files - Multiple sites, multiple repositories
Right now we are using Subversion as our versioning system but we are open to switching to Git or whatever else to get this to work.
We only know the basic SVN/Git commands so hopefully somebody can ...
0
votes
0answers
8 views
How to deal with a git that has git-svn and pure git remotes
I have two repositories, one is still an svn and acts as the main place, and another is pure git where is the daily work. I've my local clone using git svn clone svn+ssh://... and adding a remote ...
25
votes
3answers
4k views
Git-svn W: -empty_dir warnings. What do they mean?
While trying to clone an existing Subversion repository using git-svn using standard layout, I got a bunch of W: -empty_dir (and W: +empty_dir) warnings. The cloned git repository seems to be working, ...
1
vote
1answer
17 views
SVN to Git Migration from One Giant Repo to Many Small Repos
I'm woking on a Git to SVN migration. We have the following layout in one SVN repository:
Common
|-- Module A
|-- Module B
|-- Module C
`-- Module D
We have a couple of different needs and ...
10
votes
1answer
1k views
Why does “git svn fetch” command seem to be stuck and does nothing?
EDIT: Workaround.
Now we understand the issue, here is the solution: do
git svn fetch -r REVISION:HEAD
where REVISION is the number of the svn commit of the branch creation.
I've been happy ...
0
votes
1answer
130 views
Synchronizing with upstream and generating clean patches in Git
What is the recommended way to synchronize a git repo with upstream?
Let's say my work is based of SVN branch A in upstream. They have moved to branch B, and C.
I want to synchronize my work with ...
1
vote
1answer
6k views
failed to push some refs to [email protected]:myapp.git
I am getting this error when I am trying push my files into heroku rep.
Ive tried following solutions but none helped:
this
Tried git pull heroku master (results below)
Tried trying git push heroku ...
11
votes
6answers
19k views
failed to push some refs to [email protected]
I am getting this error when I am trying push my files into heroku rep.
Ive set autocrlf = false already in gitconfig but this problem is still there.
i have also tried this solution here
but no ...
0
votes
0answers
11 views
How to disable pinentry-qt in fedora 20 for git-svn ?
I use git-svn command line client to synchronize my projects to an svn repository.
Since I moved to fedora 20 (I was on fedora 17 before), when I synchronize with the svn repository (with git svn ...
0
votes
0answers
14 views
How to setup git-svn for an unusual/complex svn setup?
I'd like to use git-svn to access my company's rather unique svn codebase, we only have one project/application that is stretched over multiple svn repositories, one for each department plus some ...
1
vote
3answers
76 views
Git svn clone with author name like “/CN=myname”
I'm trying to switch from svn to git on windows 7 using git svn clone command.
On one of my repository I try this:
git svn clone --stdlayout --no-metadata -A users.txt --username=/CN=john ...
0
votes
0answers
29 views
Cannot fetch branch from git-svn repo
I wanted to create a new branch on the svn server and then create a local branch to track this new branch.
But I think something went wrong during this process because a branch is created on the svn ...
0
votes
1answer
21 views
Using git and svn on the same working tree independently
I am in a classical situation: my company system is based on svn, and probably it won't be ever change. But I like git much better because of its extended functionality, stability, flexibility and ...
12
votes
1answer
7k views
Git SVN error: a Git process crashed in the repository earlier
I was just trying to commit changes to the Git master. From what I have read, it seems that the idea is to delete the lock file. The message says:
make sure no other Git processes are running and ...
3
votes
1answer
42 views
git svn fetch & rebase broken after connection failure
I lost my network connection during git svn dcommit when it was trying to rebase. I tried to git svn rebase again, but again lost my network connection.
Now, after sorting out my network connection ...
0
votes
0answers
24 views
git svn clone failed due to Svndiff backward-sliding source view
I am in the process of migrating svn repositories to git, using git svn clone, then pushing the clone to a remote origin to act as the new git repository.
Using this process I have successfully ...
730
votes
19answers
173k views
Migrate SVN repository with history to a new Git repository
I read the Git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like:
SVN repository in: svn://myserver/path/to/svn/repos
...
0
votes
1answer
18 views
How do I resolve my two Git trees from different SVN migrations?
From svn to git but I just created new git repository without migrate with git svn... bad idea now I know...
Some work done in a new branch from this new repository without svn history...
Discovered ...
-1
votes
1answer
25 views
Working on windows server 2012 which version or type of GIT is suitable for me?
I know This type of question is already being asked before here
Git on the server(windows server 2012)
I have readed the answers also but they are really confusing.
What i have to do is I have to ...
13
votes
4answers
7k views
How do I show the SVN revision number in git log?
I'm customizing my git log to be all in 1 line. Specifically, I added the following alias:
lg = log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%an%Creset - %s %Cgreen(%cr)%Creset' ...
1
vote
2answers
24 views
Git - Remove remote branches after git-svn clone
I have cloned a SVN repo with the command git svn clone ... --trunk=trunk --tags=tags --branches=branches.
The operation have been correctly executed, and now when I list my branches I have all the ...
0
votes
0answers
42 views
Migrating huge SVN repo. to Git — How to rewrite history and still keep in sync?
Problem
I have been working with a beastly SVN repository that is 177GB and am trying to migrate it to git. Clearly there are lots of files that don't need to be in there.
After I am done rewriting ...
5
votes
6answers
3k views
How can I commit to an old git tag?
So two months ago I migrated our codebase in SVN into Git with the complete changeset history. Immediately after that, we tagged a new release and continued working. So while we've continued working ...
1
vote
1answer
21 views
Why git pull for specific folder doesn't work? Which one is better alternative fetch/merge for git pull remote in this case?
I'm currently unable to find a substitute for $ git pull origin /path/to/dir/or/file. And apart of this I've tried these two steps but no luck.
git fetch origin
git checkout HEAD /path/to/dir/
In ...
17
votes
2answers
5k views
Cloning a git-svn repository with svn metadata
I've cloned my main repository with git-svn clone svn://url/trunk --stdlayout. Now I want to clone the repository, with the svn meta data. So that I'll be able to git-svn rebase it to the main server.
...
0
votes
1answer
18 views
dcommit only a certain local (i.e. git) branch with git-svn
I am developing using git but I have to publish via svn.
That's why I've set up git-svn (by git svn clone).
My usual workflow is like this:
git svn rebase # get local git repository up-to-date
git ...
0
votes
1answer
20 views
Continue import from SVN to Git
I'm trying to write a script that migrates every SVN revision, old and new, to a git repository. I've initialized a Git repo with git init and fetched all reversions with git svn fetch from the SVN ...
3
votes
1answer
115 views
What is the best way to clone branches after cloning just trunk in git-svn?
Given a large Subversion repository with many branches, I want to start using git-svn by cloning trunk first and adding specific branches later. I saw at least three ways to do this, but are any of ...
0
votes
1answer
23 views
Can anyone help me how to migrate an SVN branch to Git repository?
The
git svn clone SVN:URL ...
command would clone the entire repository while I want to use only one specific branch of the repository and not the complete SVN repository.
3
votes
8answers
2k views
git multiple repository management
I am working on a project where we manage external libs/headers and qa with git. Here is what every developers' directory structure looks like:
~/dev/proj
~/dev/ext
~/dev/qa
proj, ext and qa are ...
1
vote
1answer
202 views
git rebase fails with Unknown exit code (128) from command: git-merge-recursive
Consider the following scenario:
- upstream repository with 2500 is stored in SVN
- git user A imports the repository into git and commits 1 patch
- git user B imports the repository into git and ...
1
vote
1answer
39 views
How to rebase Git commits to SVN after having initialized the Git repository in an SVN directory?
When my SVN server was down I created a Git repository in my SVN repository. After some commits on the master branch I want to rebase the changes back to the SVN server (this is logically possible ...
0
votes
1answer
20 views
Subsequent switch between remote branches, tracked by git-svn
I'm with git-svn on top of a customers SVN branch ('trunk')
trunk -> master -> feature
Simplified workflow is:
master: git-svn rebase
git rebase master feature [working here...]
git checkout ...
0
votes
0answers
40 views
git-svn clone with branches non-standard
I'm trying to use GIT-SVN as a frontend to an existing SVN repository.
I've used this setup quite a bit in the past, and I like it a lot.
However, I've always had trouble mapping branches in the ...
0
votes
0answers
26 views
Git-svn clone error: “fatal: Not a valid object name 'refs/remotes/tags/Tag With Spaces'”
I'm using git svn clone (git version 1.9.4.msysgit.0) to migrate a Subversion repository to Git.
The Subversion repository has tags with spaces in it, which leads to fatal: Not a valid object name ...
0
votes
0answers
9 views
Configuring git server for windows server R2
I am a user of GitHub, and I after trying Tortoise, I prefer Git.
Now I want to set up a Git Server on my Windows Server machine. And as I have never installed a version system server, I wish to know ...
17
votes
2answers
5k views
Git SVN Is Unable to Fetch from SVN Repository
I'd like to use SVN and Git together. I have an svn repository, and I'm trying to fetch to a working directory, but I encounter an error as below.
svn, version 1.6.6 (r40053)
git version ...
46
votes
3answers
26k views
What's the git equivalent of “svn update -r”?
I'm a recent git convert. It's great to be able to use git-svn to keep my branches locally without disturbing the svn server. There was a bug that existed in the latest version of the code. I wanted ...
-1
votes
1answer
19 views
Can I use git-svn to create a Git repository from a single directory in a Subversion repository?
I will be tracking a new project in a Git repository. The project has a dependency on an older library; the library is stored in a directory in a branch in a Subversion repository. The library’s ...
1
vote
2answers
1k views
When converting from svn to git using git-svn or svn2git, how can I change the base path of the repository and possibly still keep branches/tags?
I'm moving a project from SVN to git (completely, so no need for git svn's SVN interop features) and I've tried using both git svn and svn2git (nirvdrum's fork on github) and one problem I've got is ...
1
vote
1answer
54 views
Git svn clone pulls bad repository
When converting a JavaScript/Web project from Subversion to Git, I'm seeing a problem, even when I start over from scratch (the first Git repository is always bad).
The git svn clone works fine. ...
1
vote
2answers
42 views
Benefit of migrating to GIT from git-over-svn
I am thinking about converting my svn repository on my server to git, but I am not sure what would be the benefit for me, since I already use SmartGit/hg which creates a local git repository and ...
4
votes
4answers
2k views
Use git on existing SVN repo
I work with a legacy svn repo. However, I would like to enjoy the benefits of git on my local machine.
The first option is git init the root of my current repo, write code, and independently commit ...
4
votes
1answer
218 views
msysgit git-am can't apply it's own git format-patch sequence
I'm using msysgit git on windows to operate on central svn repository. I'm using git as
I want to have it's awesome little local branches for everything and rebasing on each other.
I also need to ...
0
votes
0answers
34 views
Cloning Subversion repo into git gives a HTTP 400 response (Bad Request) with regards to PROPFIND request. NOTE: path to file contains space
First of all: I don't think this issue has anything to do with a proxy (as seen with similar questions with regards to subversion and PROPFIND errors), though I do connect with my employers subversion ...
1
vote
0answers
19 views
How can you rebase to SVN without rewriting history in Git?
I work on a project that uses an SVN repo as the main repo. They make tags, the tags are what gets posted to the live environment.
So I cloned this both into an SVN working copy and into a local git ...
