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

2011-03-29 Thread Hillel (Sabba) Markowitz
On Tue, Mar 29, 2011 at 9:51 AM, Thomas Ferris Nicolaisen
tfn...@gmail.com wrote:

 Yes, this is true. By default, you'll get a lot of stale branches in your 
 fetching repo.
 For the time being, I've ignored this. I regularly clean it up. Say I have a 
 mirror of a svn repo with trunk, tags/1.0 and a branch branches/1.0.x:
 Fetching repo:
 tfnico:~/git-repos/website-fetching/git branch -a
 * master
   remotes/1.0-x
   remotes/tags/1.0
   remotes/trunk

 Bare repo:
 tfnico:~/git-repos/website.git/git branch
   1.0-x
   tags/1.0
   trunk

 Notice the 1.0-x branch.
 Now I remove the branch in SVN:
 svn rm file:///Users/tfnico/svn-repos/main/website/branches/1.0-x

 I run sync in the fetching repo:

 tfnico:~/git-repos/website-fetching/git svn fetch;git push origin
 Everything up-to-date
 So, nothing changed there. The deletion of the branch was not propagated, and 
 the 1.0-x branch still present.
 I now start cleaning up by removing it in the fetching repo:
 tfnico:~/git-repos/website-fetching/rm .git/refs/remotes/1.0-x
 tfnico:~/git-repos/website-fetching/git branch -a
 * master
   remotes/tags/1.0
   remotes/trunk

 Now sync again:
 tfnico:~/git-repos/website-fetching/git svn fetch;git push origin
 Everything up-to-date
 So, the branch is not recreated. Now clean up in the bare repo:
 tfnico:~/git-repos/website.git/rm refs/heads/1.0-x
 tfnico:~/git-repos/website.git/git branch
   rm
   tags/1.0
   trunk

 Now, branch is gone is forever, unless we later on do a full git svn clone 
 (which recreates all previous branches, also the removed ones).

 It's a bit messy, but think of it as manual maintenance you just have to do 
 once in a while.

Thanks. I will have to do it this way.

--
       Sabba     -          סבא הלל        -     Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



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

2011-03-25 Thread Hillel (Sabba) Markowitz
 So it's hard to say. I would first step away from the upci alias for
 a bit, and use the manual update-ref + dcommit commands again, just to
 be sure that there's not a bug in the alias.

 Do this:

 git update-ref refs/remotes/[branch] refs/remotes/origin/[branch]

 ... followed by git svn dcommit.

DUH I found a typo in the upci definition. I left out the s in
one of the remotes. Sorry about that. It worked when I rebuilt and ran
by hand.

I do get ambiguous remote warnings when I do a pull.

--
       Sabba     -          סבא הלל        -     Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



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

2011-03-25 Thread Hillel (Sabba) Markowitz
On Fri, Mar 25, 2011 at 3:29 PM, Thomas Ferris Nicolaisen
tfn...@gmail.comwrote:

 OK, glad it worked. What kind of warnings are you getting?


Warning: refname 'master' is ambiguous

-- 
   Sabba -  סבא הלל- Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



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

2011-03-23 Thread Hillel (Sabba) Markowitz
On Wed, Mar 23, 2011 at 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 guide:
 http://blog.tfnico.com/2010/11/git-svn-mirror-for-multiple-branches.html


When I do the full git svn clone, it creates the SHA1 files branch
name in .git/refs/remotes. I need to set up a loop to so that it can
obtain and do the update-ref command. Once I do that, then when I do
git svn rebase --all it actually builds the entire same way as if I
had built it from the start. Is there a good way of doing this?

I am trying to set it up with a python script so that the other
developers in the team can do this quickly.

-- 
       Sabba     -          סבא הלל        -     Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



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

2011-03-22 Thread Hillel (Sabba) Markowitz
On Tue, Mar 22, 2011 at 1:36 PM, Thomas Ferris Nicolaisen
tfn...@gmail.com wrote:
 Thanks. Unfortunately I do have a lot of branches. Actually, the fetch
 does pick up all branches and sends them to the bare repository so
 that every fetch updates every branch. So far it is only the dcommit
 that is giving the problem. I am trying to avoid having to get
 everyone use a git svn clone from the original svn repository rather
 than a git clone from a git repository. So far, the only way to do
 this is to only dcommit to the trunk (or master).

 How about having people..

 * cloning the bare repository (so they don't have to wait for the very
 long git svn clone process)
 * doing a git svn init -s svn_url (like it is configured in the fetching repo)
 * dcommit to svn themselves with upci.

 I would also have to set up automatic scripts to dcommit when everyone
 commits as well.

 I think it's best that people themselves are responsible for running
 dcommit/upci. Automating committing to svn like this can be a bit
 dangerous.

I don't quite follow what you mean here.

git svn init -s svn_url svn_dir

just sets up an empty situation. To get the bare repository,
wouldn't I have to have the git svn be fully cloned?

-- 
       Sabba     -          סבא הלל        -     Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



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

2011-03-22 Thread Hillel (Sabba) Markowitz
On Tue, Mar 22, 2011 at 6:38 PM, Thomas Ferris Nicolaisen
tfn...@gmail.comwrote:

 The trick is to first clone the bare repository, and then do a git svn init
 inside it, so it can be used for dcommitting.

 There are two ways to set up a repository that you can dcommit from:

 1) git svn clone (takes ages with big repositories)
 2) git clone existing repository, and then do git svn init inside of it.

 I assume you have done git svn clone once to create the fetching repo. You
 pushed all content to the bare repo.

 Now, developers can clone the bare repo, do git svn init inside of it, and
 then they can dcommit from there, instead of having to do their own git svn
 clone.


I am not sure what you mean

Is it

git clone bare-url gitdir
git svn init svn-url gitdir

Would this set up the local repo?


-- 
   Sabba -  סבא הלל- Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Using branches within a git svn repository

2011-03-16 Thread Hillel (Sabba) Markowitz
I created a git repository using the instructions in
http://blog.tfnico.com/2010/08/syncing-your-git-repo-with-subversion.html
and it seems to be set up correctly. The svn fetch repository has
branches as

* master
remotes/branch1
remotes/branch2

while the bare repository (for the team to pull from and push to)  just has

* master


In the svn repository should I run

git branch branch1 remotes/branch1
git branch branch2 remotes/branch2

In that case, should I push

git push origin branch1
git push origin branch2
git push origin master

Or is there a way to handle the pushing fully without specifying what
needs to be pushed?

For example would git push origin be sufficient?

When keeping the fetch repository up to date do I always use git svn
rebase or do I need to do git svn fetch to keep the branches up to
date?

--
       Sabba     -          סבא הלל        -     Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore
 sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.