Solved

Ankhsvn or svn

Posted on 2011-09-03
13
315 Views
Last Modified: 2012-08-13
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
0
Comment
Question by:thready
  • 9
  • 4
13 Comments
 
LVL 40

Expert Comment

by:evilrix
Comment Utility
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.
0
 
LVL 1

Author Comment

by:thready
Comment Utility
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.
0
 
LVL 1

Author Comment

by:thready
Comment Utility
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/
0
 
LVL 40

Accepted Solution

by:
evilrix earned 500 total points
Comment Utility
Trust me when I say it is worth the effort. In the end it'll probably be less time that trying to convince SVN to branch and merge.

This is probably your best resource.

http://progit.org/

Look up git-svn for how trivial it is to import an SVN repo into Git.
0
 
LVL 1

Author Comment

by:thready
Comment Utility
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.
0
 
LVL 1

Author Comment

by:thready
Comment Utility
Which merge tool do you use?
0
Threat Intelligence Starter Resources

Integrating threat intelligence can be challenging, and not all companies are ready. These resources can help you build awareness and prepare for defense.

 
LVL 1

Author Comment

by:thready
Comment Utility
(on windows)?
0
 
LVL 1

Author Comment

by:thready
Comment Utility
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...
0
 
LVL 40

Expert Comment

by:evilrix
Comment Utility
0
 
LVL 1

Author Comment

by:thready
Comment Utility
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?
0
 
LVL 1

Author Comment

by:thready
Comment Utility
"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...
0
 
LVL 1

Author Closing Comment

by:thready
Comment Utility
Thanks a lot evilrix, as usual, excellent advice!
0
 
LVL 40

Expert Comment

by:evilrix
Comment Utility
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.
0

Featured Post

How to run any project with ease

Manage projects of all sizes how you want. Great for personal to-do lists, project milestones, team priorities and launch plans.
- Combine task lists, docs, spreadsheets, and chat in one
- View and edit from mobile/offline
- Cut down on emails

Join & Write a Comment

Does the idea of dealing with bits scare or confuse you? Does it seem like a waste of time in an age where we all have terabytes of storage? If so, you're missing out on one of the core tools in every professional programmer's toolbox. Learn how to …
In this post we will learn how to connect and configure Android Device (Smartphone etc.) with Android Studio. After that we will run a simple Hello World Program.
The goal of the video will be to teach the user the difference and consequence of passing data by value vs passing data by reference in C++. An example of passing data by value as well as an example of passing data by reference will be be given. Bot…
The viewer will learn how to clear a vector as well as how to detect empty vectors in C++.

762 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question

Need Help in Real-Time?

Connect with top rated Experts

9 Experts available now in Live!

Get 1:1 Help Now