decentralized development using git and git-svn

Posted by CantGetANick on Stack Overflow See other posts from Stack Overflow or by CantGetANick
Published on 2011-01-10T09:35:30Z Indexed on 2011/01/10 11:53 UTC
Read the original article Hit count: 139

Filed under:

git

|

git-svn

We have 2-3 small teams of 2-3 people. We all use git for local and svn for central repository and git-svn got sync. This is works all the time except when we want to share our code between the team it self.

So we have tried out git pull, this creates lots of conflicts and it does not detect that we are on the same tree. It fetches all the changes (same as clone then pull) Of course i dont want to clone full repo. every time I want to share.

Please suggest a better flow.

We can't get rid of central svn.
We can't clone every time.

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about git-svn

Maintain set of local commits working with git-svn

as seen on Stack Overflow - Search for 'Stack Overflow'
I am using git to develop against a project hosted in subversion, using git-svn: git svn clone svn://project/ My general workflow has been to repeatedly edit-and-commit on the master branch, then commit to the svn repository via: git stash git svn dcommit git stash apply One of the local modifications… >>> More
I need git-svn to act as a Subversion v1.5+ client

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm running git 1.7 on Mac OSX, installed via Homebrew. I'm trying to use git svn to work with a Subversion server that requires Subversion 1.5 clients (a restriction enforced via a pre-commit hook.) Running git svn --version reveals that as far as git is concerned, git svn is equivalent to svn v1… >>> More
Using git-svn with existing svn project

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm currently working on a project that has a svn repository. I'm used to git and love the way it allows me to have a local repository, so I would like to use git-svn with this project. I would like to know how to use git-svn from a svn project already in my computer. Do I really need to make a clone… >>> More
git-svn error importing repository: fatal: Not a valid object name

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm getting the following error attempting to clone an svn repository. Anyone seen this before? $ git svn clone -s https://npanday.svn.codeplex.com/svn npanday Initialized empty Git repository in /home/kurtharriger/npanday/.git/ fatal: Not a valid object name ls-tree -r --name-only -z : command… >>> More
Git-svn: create & push a new branch/tag?

as seen on Stack Overflow - Search for 'Stack Overflow'
After cloning an SVN repository using git-svn with the -s option (git svn clone http://server/repo -s), how does one create a branch or tag and have pushed to the relevant branch/tag directory in the repository when dcommiting? For instance; if I were to use git to create a foobar branch locally… >>> More