[git-users] Re: Problem with givt svn clone

2011-06-25 Thread Sabba Hillel
When I ran the build of a git from an svn repository, I had to do the git svn clone in order to get the branches from scratch. I then had to create the new one as a bare *seperately*. You will then have two repositories and then push the entire git svn repository to the new one. This works only

[git-users] Re: dcommit with conflict

2011-03-30 Thread Sabba Hillel
I resynchronized the fetch and bare repositories to the main svn repository. On my local platform I checked out a different branch and then checked out the test branch to ensure that I got the correct files. I made sure to do a git pull --rebase --all The files were then fully synchronized. I

[git-users] Re: dcommit with conflict

2011-03-30 Thread Sabba Hillel
On Mar 30, 1:43 pm, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: You are right with one clarification: The svn repository must be set up to trigger a rebase in the fetching repository upon committing. I've found the best way to do this is to have a svn post-commit hook that triggers a

[git-users] dcommit with conflict

2011-03-29 Thread Sabba Hillel
In running a git upci on a particular file, it has been updated in the svn repository but not yet picked up by the git svn fetch repository or put into the git repository. Running git upci (update-ref and dcommit) I get an error message from dcommit. Commiting to svn repo/README.txt Merge

[git-users] svn remove branch not passed through to git

2011-03-28 Thread Sabba Hillel
I created a bare git repository with a number of branches. I then created a fetch directory using git svn. A particular branch was removed from the repository using svn (call it old_branch). THe browser shows that old_branch has been removed and is not in the http index. However, when I issue git

[git-users] Re: svn remove branch not passed through to git

2011-03-28 Thread Sabba Hillel
On Mar 28, 2:04 pm, Sabba Hillel sabbahil...@gmail.com wrote: I created a bare git repository with a number of branches. I then created a fetch directory using git svn. A particular branch was removed from the repository using svn (call it old_branch). THe browser shows that old_branch has

[git-users] Re: Running a dcommit for all branches

2011-03-24 Thread Sabba Hillel
On Mar 23, 2:03 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Almost, this is how: git clone bare-url gitdir cd gitdir git svn init svn-url This is 5. Set up an SVN remote in the developer's repo in this

[git-users] Re: Running a dcommit for all branches

2011-03-23 Thread Sabba Hillel
On Mar 23, 2:03 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Almost, this is how: git clone bare-url gitdir cd gitdir git svn init svn-url This is 5. Set up an SVN remote in the developer's repo in this

[git-users] Running a dcommit for all branches

2011-03-22 Thread Sabba Hillel
I currently have a bare repo to be used by a development team for maintaining a project with git. I have a fetch repo which was created using git-svn. The fetch repo gets the updated information from the central svn repository using git svn --all git push origin --mirror This lets me pick up

[git-users] Re: Running a dcommit for all branches

2011-03-22 Thread Sabba Hillel
There is a typo below: On Mar 22, 1:14 pm, Sabba Hillel sabbahil...@gmail.com wrote: I currently have a bare repo to be used by a development team for maintaining a project with git. I have a fetch repo which was created using git-svn. The fetch repo gets the updated information from

[git-users] Re: Trying to push a change back to git svn central repository

2011-03-15 Thread Sabba Hillel
On Mar 15, 1:54 pm, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Hi Sabba, The thing is that the repository on *gitserver* has to be a bare repository. Usually all central git repositories are bare. It doesn't make sense for them to have a work-tree, and that's why Git stops you from

[git-users] Re: rebase question

2011-03-12 Thread Sabba Hillel
On Mar 11, 3:14 pm, ryan ryansu...@gmail.com wrote: I want to rebase the current branch B1 from origin/A1 to origin/A2 so I want to use this command git --onto origin/A2 origin/A1 B1 Q1: is this command right? (A2 is based on A1, current branch is B1, B1 is already pushed to origin, a

[git-users] git svn branch handling

2011-03-04 Thread Sabba Hillel
Please respond directly to sabbahil...@gmail.com as I do not have time to follow this mailing list. I am attempting to set up a git repository based on an svn repository. The idea would be that the members of the project would be able to use git exclusively with the central git repository acting