[git-users] Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Tomer Godinger
Hello, I've been trying to set up a Git repository to replace SVN in common use for a project in my work place. I wish to be able to work on a local Git repository most of the time, and occasionally update a centralized SVN repository with the changes. A problem presents when I try to clone the

[git-users] Re: Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Thomas Ferris Nicolaisen
Hi, Could you provide us with the exact git svn clone command you are initially running? Also a picture or some overview of the folders in your SVN repository would be nice. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view

[git-users] Re: Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Tomer Godinger
Hi. Thanks for the swift reply. The basic command I tried to use was: git svn clone -r --stdlayout --preserve-empty-dirs http://MyRepoAddress/Some/Dirs/MyDir . Where stands for the revision I want, "MyDir" is the name of the directory I'm trying to get, and the rest of the address is t

[git-users] Re: Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Thomas Ferris Nicolaisen
I assume, that the clone url follows the structure of your repository, so it is something like http://MyRepoAddress/a/b/MyDir, right? It looks to me like that git-svn clone should work. Could you try cloning a little a toy project of mine like this? git svn clone -r11 --stdlayout --preserve-emp

[git-users] Re: Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Tomer Godinger
Your assumption is correct. I supplied the clone command with the path to the MyDir directory within the repository. I'll be able to try cloning your project when I get home, but it won't be from the same machine, so I'm guessing it wouldn't be of any help. I'm afraid the systems I was referring

[git-users] Re: Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Thomas Ferris Nicolaisen
Try using a range of commits, like -r:HEAD or something like that. In the past, I've used a Linux machine to make the initial git-svn clone, and then have Windows machine base their clones on this (and doing a git-svn init inside their clones so they can do git svn dcommit & rebase) to avoi

[git-users] Re: Cloning Specific Revision of Problematic SVN Folder

2012-06-28 Thread Tomer Godinger
Yes, that worked! =) I actually tried using a range of revisions before, but this time I used a wider range, and it worked properly. It only got a single branch, but I'm guessing it's because the other branches and tags are in older revisions. I'll just get them one by one using their specific

[git-users] how to merge to separate repositories.

2012-06-28 Thread Nicolas Bock
Hi, a few years ago, we switched from using CVS to git. Since at the time I didn't know about git cvsimport (I was just beginning to use git), I checked out the most recent version from CVS and made that the initial commit of our git repository. This unfortunately meant that we lost all histor

[git-users] Re: how to merge to separate repositories.

2012-06-28 Thread Tim Chase
On 06/28/12 12:57, Nicolas Bock wrote: > I checked out the most recent version from CVS and made that the > initial commit of our git repository. This unfortunately meant > that we lost all history prior to the switch. > > We would now like to add that missing history into git. I > converted the C

Re: [git-users] how to merge to separate repositories.

2012-06-28 Thread Philip Oakley
You can use Grafts as a method for linking between the two repos to give the appearance that the history is continuous [apparently it was used for adding the early Linux history]. This does not change any of the sha1 values so their use in validating the complete history won't be valid. Also pro

Re: [git-users] how to merge to separate repositories.

2012-06-28 Thread Nicolas Bock
Hi Philip, thanks a lot! With the additional help of http://ben.straubnet.net/post/939181602/git-grafting-repositories, which explains in detail how to construct the .git/info/grafts file, I managed to glue the histories together. I followed your suggestion of using filter-branch instead of --fast

[git-users] Re: how to merge to separate repositories.

2012-06-28 Thread Tim Chase
On 06/28/12 13:44, Philip Oakley wrote: > You can use Grafts Always happy to learn new git tricks. Thanks! This is a far better solution than my rebasing, though with similar (albeit easier and cleaner) results if you plan to push anywhere. >From what I read, the grafting doesn't get pushed, so