thready
asked on
Ankhsvn or svn
Hi Experts,
I didn't create the trunk/branches/tags folder structure when I first started using SVN 2 years ago. I have many solutions that hardcode full paths to the location of project files, dlls, libs, etc. Now I'm wondering - I want to start branching in svn - am I stuck ? Will I have a difficult time doing this properly if I don't retro-adopt the trunk/branches/tags structure?
Thanks!
Mike
I didn't create the trunk/branches/tags folder structure when I first started using SVN 2 years ago. I have many solutions that hardcode full paths to the location of project files, dlls, libs, etc. Now I'm wondering - I want to start branching in svn - am I stuck ? Will I have a difficult time doing this properly if I don't retro-adopt the trunk/branches/tags structure?
Thanks!
Mike
evilrix
I'd import you SVN repo into a Git repo (this is simply done using the git-svn tool) and ditch SVN. Its ability to branch is almost pointless. Git was designed from the ground up to support inexpensive branching.
ASKER
Looks like a solid source control system. Deadlines are tight right now though, I don't think I have the time to learn the ins and outs of this system.
ASKER
Although now I'm intrigued - it looks like I'll be spending the rest of today looking at GIT. I just stumbled across this compelling article: http://thinkvitamin.com/code/why-you-should-switch-from-subversion-to-git/
ASKER CERTIFIED SOLUTION
membership
This solution is only available to members.
To access this solution, you must be a member of Experts Exchange.
ASKER
I'm already reading the progit book - chapter 2..... I plan on reading the whole thing- I'm already setting up git with the different tools on windows (notepad++ without session, notabbar, etc), ...
I will definitely give it a very good try.
I will definitely give it a very good try.
ASKER
Which merge tool do you use?
ASKER
(on windows)?
ASKER
I used kdiff... I'm now looking into a gui for git in VS2010.... I know the command line is probably the way to go.... but I like GUIs...
ASKER
i'm a bit confused. Within the bash shell, I did the following command to pull the repository into git:
git svn clone http://myIP/svn/dev c:\devGit
I do see all the files from my repository in my c:\devGit folder, but now I realized I should NOT have pulled it all into a different folder like I did. Is it ok to delete this whole folder with Windows Explorer (since it's a copy that I shouldn't be using), or is there a repository delete command that I should use through Git? I assume that instead of c:\devGit, I should have used the same folder name as my current svn working folder?
Also, do you know of a way to git svn clone from an earlier svn revision number?
git svn clone http://myIP/svn/dev c:\devGit
I do see all the files from my repository in my c:\devGit folder, but now I realized I should NOT have pulled it all into a different folder like I did. Is it ok to delete this whole folder with Windows Explorer (since it's a copy that I shouldn't be using), or is there a repository delete command that I should use through Git? I assume that instead of c:\devGit, I should have used the same folder name as my current svn working folder?
Also, do you know of a way to git svn clone from an earlier svn revision number?
ASKER
"Also, do you know of a way to git svn clone from an earlier svn revision number?"
What I meant by this - I was doing some work in my main line (I only had a main line anyway). I didn't want to branch with svn because I didn't know how to, so I checked in some changes that broke the main line. Then I pulled the earlier revision that wasn't broken into my working folder.
Now what I'd like to do is start using git, but with this working version- so when I clone, I'd like to clone from revision 1 to revision n-2...
What I meant by this - I was doing some work in my main line (I only had a main line anyway). I didn't want to branch with svn because I didn't know how to, so I checked in some changes that broke the main line. Then I pulled the earlier revision that wasn't broken into my working folder.
Now what I'd like to do is start using git, but with this working version- so when I clone, I'd like to clone from revision 1 to revision n-2...
ASKER
Thanks a lot evilrix, as usual, excellent advice!
A git repo is completely self contained so you can just delete the whole folder.
Not sure about pulling a specific revision from svn as I've always just pull from the head of trunk. 'Git help svn' should point you in the right direction.
Not sure about pulling a specific revision from svn as I've always just pull from the head of trunk. 'Git help svn' should point you in the right direction.