Tagged Questions
4
votes
1answer
18 views
Should we ignore Solution Output folder while we are using Visual Studio and Version Control?
I'm using Bazaar and Visual Studio 2010 in a C# project. I have prepared an ignore list but still I think all the files in Solution Output directory could be ignored.
I search a lot but nobody had ...
1
vote
1answer
16 views
git-svn: Unable to determine upstream SVN information from working tree history
I'm trying to sync my svn repository to git on a daily basis. After much reading, I was able to make this work by manually creating the following in my .git/config:
[svn-remote "svn"]
url = ...
0
votes
1answer
20 views
How do I properly manage multiple Git clones of an SVN repositorie?
One of the projects I work on uses a SVN repository to manage its code. I would like to use Git for version control on all of my machines, as well as be able to host a copy of the repository on ...
2
votes
1answer
23 views
Remove ignored files from repository
I migrated my SVN repository to Git. I know that I have a lot of big old files in my repository, which generally should be ignored (I was noob in VCS when I started my project, so with every commit I ...
3
votes
0answers
29 views
git-svn: Is there a good branching and merging pattern?
I'm running the git-svn client on my machine. I'd like to have a pattern similar to a standard git branching and merging pattern, wherein you have a development branch which was branched from trunk, ...
0
votes
0answers
12 views
git-svn: merging repoints branch to merge-from url
I have a git-svn project. In that project I'm checking out an existing branch with this command:
git co -t develop -b local/develop
I have a branch already checked out with this command:
git co ...
0
votes
1answer
19 views
Configuring git-svn
I'm an svn user with a requirement to mirror my svn code to a git repository. Users of git will not have access to the svn repository, so the solution cannot rely on checking out the code directly ...
1
vote
2answers
41 views
ZF2 applications: best practice workflow for modules
I am writing a ZF2 Application. I started with ZendSkeletonApplication, and I will be adding some modules to it. I may end up with tens of major modules in the application:
modules/
Module1/
...
0
votes
2answers
41 views
git after init and push? I need to clone a new?
I am not a skilled.
in ssh server, I create :
$ mkdir project.git
$ cd project.git
$ git --bare init
and then in my pc:
$ cd myproject
$ git init
$ git add .
$ git commit -m 'initial commit'
$ git ...
0
votes
1answer
24 views
svn to git, upgrading software, and migrating to a new vm all at once
I have several tasks that I have been assigned to do and I'm trying to figure out the best order to accomplish them in and if there are any major pitfalls I should be aware of. Here's a list of what ...
2
votes
3answers
135 views
Migration from svn to git. Which option is the best: giant trunk, submodules, subtrees
I know there are much questions about the same thing but i still need more information.
I am investigating possibility of migrating our SVN repo to git and trying to understand what approach (monolith ...
1
vote
2answers
23 views
How to make TortoiseSVN / TortoiseGit show the executed command?
Tortoise GUI clients are cool, but they don't really help to understand, how versioning woks and what happens "behind the scenes". And understanding such things is very important, especially for Git. ...
0
votes
0answers
11 views
xcode5 bot can not do well while I use Subversion source control
When I want to integration my work on Subversion, but it never succeeded,while I integration my work on Git, it works well.
And when it failed, there is no logs in source control log and a lot of logs ...
0
votes
0answers
14 views
SVN/Git Workflow for team working on remote server in Eclipse
I work for a small software house writing PHP web apps.
We have a development remote server in the cloud (we usually connects to it using ssh and sftp, it's an ubuntu machine).
Our developers (we ...
0
votes
0answers
18 views
When git svn dcommit can be used?
I want to learn how to use git with svn repository.
I follow this manual: http://git-scm.com/book/en/Git-and-Other-Systems-Git-and-Subversion
I make some changes in my file. Some of them staged, ...
1
vote
1answer
48 views
Git. Store several projects under the same repository
Imagine mobile application that is planned to be implemented for both iOS and Android.
Development was started from the iOS version only and now the time has come to start with Android one.
iOS ...
1
vote
0answers
31 views
Pull in Individual File/Directories from External Repositories of Different Structure while Retaining Git History
A project I'm working with will be pulling in individual files from many remote repositories. It is vital that every file pulled in retain its full commit history from its original repository when its ...
0
votes
1answer
25 views
Php/Webstorm - how to change from svn to git?
Our company version control system (VCS) standard is Subversion and I've checked out the project from svn in Webstorm. I want to also use git so that I can easily create branches to test various ...
0
votes
1answer
53 views
Git: copy part of branch to another branch
Let's say we have versions that are on separate branches.
master
v1
v2
Our workflow with SVN was that we made bug repairs on master and then merged them into v1 and v2, new features should wait ...
0
votes
1answer
31 views
How to commit a project checkout from GIT into SVN?
I have a project(built using maven) and checked out from Git. I want to check in this project into a SVN repo. I am using Eclipse Kepler and MacOSx. How do I do this?
0
votes
1answer
21 views
Automatic Merge svn-git?
I have a few question.
First of all i want to know is git better than subversion?
I am using subversion i want to merge trunk to brach automaticly , how can i do this? If it’s impossible do i have to ...
1
vote
1answer
25 views
svn2git is ignoring “--username”-parameter
I just tried importing an svn-repo to a git repo, but I'm facing a bit of a problem. After starting to import the first repo with svn2git http://path.to.repo.com/repos/a/ --username abc --verbose i ...
0
votes
2answers
28 views
How should I use Subversion and Time Machine on a dual-boot Macintosh?
Using Eclipse, I'm developing and maintaining Java desktop applications. My Mac users have OS X versions from 10.6 to 10.9. My development machine has two disk partitions and can boot either OS X 10.6 ...
1
vote
0answers
25 views
Can an SVN external pull down a Git repository's submodules?
Since Github allows you to pull Git repositories down as SVN, I've included a Github repository as an external.
trunk (svn:external https://github.com/Automattic/vip-quickstart base)
... that ...
0
votes
2answers
21 views
git svn already set … wanted to set to:
I am trying to clone/fetch svn branch with git-svn:
git config --add svn-remote.stable-2012-03-29.url https://some_host/branch
git config --add svn-remote.stable-2012-03-29.fetch ...
2
votes
2answers
42 views
jgit logs with change history
I'm trying to show file change history using JGIT. I managed to get the history of commit messages. But couldn't get changes related to each commit (like git log -p) , Basically I need to check what ...
4
votes
2answers
71 views
How do I add file to remote Git repo (Github) without cloning the whole repo first
This Git question is very similar to another one about SVN.
I have a repo full of big files and I need to add a single file to it. This used to be very easy in SVN.
svn import -m "Adding just a ...
0
votes
0answers
26 views
Using git-svn when you don't have permissions on the root of the repository
I'm in a situation where I have to work with an SVN repository hosted external to my organization and I'd much prefer to be using git-svn than SVN directly.
I can easily git svn clone ...
0
votes
0answers
25 views
git svn, how should I init my svn repo and syncronise with my existing git repo
I have currently working git repo at url_git and new svn repo at url_svn.
I want to use svn repo with git svn -plugin and I've cloned repo with:
git svn clone --username user url_svn/project_svn
...
2
votes
1answer
46 views
Set up a working copy under both Git and Svn version control
For reasons I will not go into explaining (unless required) I have two repos, a subversion and a git one, where my project (identical copies of it) is located. I need to keep it this way, if possible.
...
2
votes
5answers
78 views
Version Control System for binary data, what did you use for your project?
We need to setup a version control system for large binary files, but we can't say the maximum possible size, since it depends on the project we get in the future (we work with 3D application). But ...
2
votes
1answer
37 views
Using SVN and Git side-by-side
I'm using SVN and Git to version-control the same folder, and am committing to 2 separate repositories; one hosted on Google Code and the other on GitHub, respectively.
SVN creates .svn directories ...
0
votes
1answer
45 views
Cloning a subversion project from google code using git
There is someone's project at google code which I want to clone using git. However, nothing of these worked:
git clone http://some_app.googlecode.com
git clone http://some_app.googlecode.com/svn
...
1
vote
3answers
124 views
Feature Toggles vs Feature Branches
What are "Feature Toggles" and "Feature Branches" and what's the difference between them?
What are the pros and cons? Why is one better than the other?
I found some articles on Google regarding ...
1
vote
1answer
42 views
From svn to git, with a moved trunk
I'm trying to switch my svn repository to git. It's an old repository, and one of the previous maintainer moved the trunk for each new release. For example, the previous repository was at:
...
0
votes
1answer
47 views
How to run git.exe from the command line if TortoiseGIT is already installed?
I can't run git from the CMD console window. I need to run it because TortoiseGit is not smart enough to accept a self-signed certificate to import an SVN repository. And I need to run git.exe at the ...
0
votes
1answer
54 views
How git-svn or git-flow commands are executed without dash in between
When installing git-flow I realized it is just putting files in /usr/local/bin mainly git-flow which is the executable, I'm able to invoke the script git-flow by running git flow (without dash in ...
0
votes
2answers
28 views
How to add all edited files in gitbash command prompt?
I'm new to bitbucket, when I want to push something to master branch, I do this:
git add test.html
git commit -m "messsage"
git push
My question is, is there a way to do git add but target all ...
3
votes
2answers
94 views
How is SVN v 1.8 branching / merging compared to Git?
I have been using Git for a while now, and have been recently asked why its merging and branching capabilities are better than those of SVN. Years ago, when I used SVN, I found that branching and ...
1
vote
1answer
64 views
Completely remove an empty git commit from Subversion history
So I migrated a SVN repository to GitHub. I checked out the migrated repository using SVN, and I accidentally made an empty commit (r75 in SVN history). In order to remove the empty commit, I checked ...
1
vote
0answers
12 views
Pushing revisions of a single file via git-svn
I am developing a small project in git: it is actually a single XML file plus a couple of scripts for testing purposes. I need to submit that XML file to a third party who keeps a several such XML ...
1
vote
1answer
33 views
What features make a file format friendly to VCS?
I'm writing an application with an xml-based file format that stores a graph of objects. I don't have a previous version to support.
My users are likely to place the files under version control and ...
1
vote
2answers
39 views
Settings up git workflow
I am involved in project with three more developers and currently setting up the git repository in BitBucket. So far I have created the master repo and a develop branch. If I want to follow the git ...
0
votes
0answers
24 views
Unable to determine upstream SVN information from working tree history
I have my old repository on svn, and now I want to move to git, while doing this i am facing following problem.
I checkout my branch as
git clone <svn URL> <localName>
[remote "origin"]
...
0
votes
0answers
22 views
Can I include other Non-Standard directories when using svn2git?
I have a non-standard SVN repo that I want to selectively convert into a git repository; the layout is similar to this:
repo/
other/
buildTools/
otherLib/
stuffIDontWant/
...
2
votes
2answers
77 views
Is it correct that subversion, but not git, allows empty folders?
Rephrasing this question as it seemed to cause some confusion:
A vast amount of googling, has, surprisingly, found no definitive reference stating that Subversion does 'allow empty folders'.
...
1
vote
1answer
22 views
What does git svn clone with no params for layout do?
I have a grouped multi-project repo with the following structure:
http://my.subversion.host/svn/repos/PRJGRP/projectN/{trunk,branches,tags}
Let's say I'm cloning project 1; the following commands ...
2
votes
1answer
233 views
Migrate from Git to Svn
I have a project which requires to port a git repository to svn. I tried several ways posted on line, but none of them works for me up to now. If someone can help, I'll be really appreciated. Here's ...
1
vote
3answers
64 views
Does SVN allow commit and push?
I haven't worked with SVN in years. Now I have to. With SVN do you get a 'local' copy that you work against and then when you have things right do you push them out to the rest of the team? Or is ...
1
vote
1answer
37 views
GIT: efficient way to prevent commiting non-functional changes?
I don't want any non-functional changes like spacing, new lines, tabs in my commits. I used to use SVN which had a UI showing 2 screens (old file on left, file I'm about to commit on right) that let ...