Solved

Ankhsvn or svn

Posted on 2011-09-03
13
334 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
ID: 36478762
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
ID: 36480505
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
ID: 36480529
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
Master Your Team's Linux and Cloud Stack!

The average business loses $13.5M per year to ineffective training (per 1,000 employees). Keep ahead of the competition and combine in-person quality with online cost and flexibility by training with Linux Academy.

 
LVL 40

Accepted Solution

by:
evilrix earned 500 total points
ID: 36480688
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
ID: 36480703
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
ID: 36480709
Which merge tool do you use?
0
 
LVL 1

Author Comment

by:thready
ID: 36480710
(on windows)?
0
 
LVL 1

Author Comment

by:thready
ID: 36480901
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
ID: 36481471
0
 
LVL 1

Author Comment

by:thready
ID: 36489090
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
ID: 36489550
"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
ID: 36495863
Thanks a lot evilrix, as usual, excellent advice!
0
 
LVL 40

Expert Comment

by:evilrix
ID: 36498908
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

DevOps Toolchain Recommendations

Read this Gartner Research Note and discover how your IT organization can automate and optimize DevOps processes using a toolchain architecture.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

Although it can be difficult to imagine, someday your child will have a career of his or her own. He or she will likely start a family, buy a home and start having their own children. So, while being a kid is still extremely important, it’s also …
Computer science students often experience many of the same frustrations when going through their engineering courses. This article presents seven tips I found useful when completing a bachelors and masters degree in computing which I believe may he…
An introduction to basic programming syntax in Java by creating a simple program. Viewers can follow the tutorial as they create their first class in Java. Definitions and explanations about each element are given to help prepare viewers for future …
In this seventh video of the Xpdf series, we discuss and demonstrate the PDFfonts utility, which lists all the fonts used in a PDF file. It does this via a command line interface, making it suitable for use in programs, scripts, batch files — any pl…

785 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