All Questions
56 questions
0
votes
1
answer
52
views
Add (not create) remote branches to local repo using git-svn
I am working on big SVN repository using git-svn. Pure svn is very slow. I should have cloned my repository using command:
git svn clone <rep_url> -T trunk/ -b branches/ --no-minimize-url css
...
- 444
2
votes
2
answers
3k
views
How to git clone an SVN repository where all branches are located in root?
My SVN structure is like this:
/
|-- Branch1
|-- Branch2
|-- Branch3
...
How can I clone this into a git repository preserving the branches (i.e. not flat history)?
Bonus question: How to clone only ...
- 1,577
1
vote
1
answer
170
views
Can't checkout new local branch after successfull git svn fetch
I am using git locally with an SVN repository, with the script "git-svn" that makes the translation. I have no choices about this since my colleagues are still using svn and don't plan on switching to ...
- 2,624
0
votes
1
answer
38
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
0
votes
1
answer
52
views
tortoise merge confusion on updating the branch
I have a branch named A. I create another branch from A named as B. I work on the new branch B and push it. Later on I work on branch A and push it. Now, I switch back to branch B but I want it to ...
- 1,710
3
votes
2
answers
184
views
Linking SVN repository trunk as branch for Git repository subfolder
I have open source project in Git repository. In the project, I'm using source code of another open source project. That code is stored in Git repository subfolder. I'd like to add the SVN repository [...
- 203k
0
votes
0
answers
70
views
2 svn -> 1 git. How to map two svn repositories into one git with two branches with common origin?
The project I work on was divided on 2 projects one year ago. For this svn repository was copied to another location and work was continued into 2 different svn repositories.
Now I have to merge ...
- 12.9k
0
votes
1
answer
763
views
git svn: Avoid large-scale conflicts in branching, merging, and rebasing
I work on two machines (Mac and Windows) with git-svn. My remote repo is an svn. I use the Mac as master repo, and the Windows as a slave. So all git-svn operations are done on the Mac, and the ...
- 11.7k
0
votes
1
answer
334
views
Files of new SVN branch are fetched with wrong path when running git svn fetch
I have a git repository cloned from SVN with std layout a while ago. (It was done with git svn init and git svn fetch). Now I am using git 1.7.9.
My svn-remote config section looks like this:
[svn-...
- 41
2
votes
2
answers
1k
views
Git with SVN trunk and branches
Since I've been using Git, I liked the fact that you can create a local branch which you can squash to your master branch and DCommit to SVN (on trunk), and then delete that local branch (on Git).
...
- 2,183
1
vote
0
answers
73
views
git-svn new branch refetches the whole history
I wanted to create a git clone of a big svn repo with git-svn.
My primary problem however is that whenever a new branch is created, the whole history is re-downloaded:
"Found possible branch point" ...
- 11
165
votes
5
answers
241k
views
How can I combine two commits into one commit?
I have a branch 'firstproject' with 2 commits. I want to get rid of these commits and make them appear as a single commit.
The command git merge --squash sounds promising, but when I run git merge --...
- 63.9k
0
votes
1
answer
448
views
git branches show diffs but merge does nothing
I have two branches, "svnbranch" that's updated via "git svn rebase" and "master" used by other git users that push their changes.
Right now when I do "git diff master" I see some changes in master ...
- 1,175
0
votes
1
answer
101
views
Create an svn tag from an existing git tag
I am trying to create a proper SVN tag from an annotated git tag. I presumed that what I have to do is :
checkout the tag -> done
git svn branch -tm "version x"
Calling the branch command results in ...
- 61.6k
2
votes
1
answer
559
views
`git svn dcommit` failing on a branch
I have been using git-svn to communicate with my company’s svn repo for a while now without any major headaches.
Today, the “headache”-part changed dramatically:
I’ve been working on master/trunk ...
- 4,708