SVN makes me cry - General Discussion and Assistance - CHDK Forum
« previous next »
Pages: [1]   Go Down

SVN makes me cry

  • 2 Replies
  • 3116 Views
*

Offline RaduP

  • *****
  • 926
SVN makes me cry
« on: 21 / September / 2009, 20:17:37 »
Advertisements
This is the first time I used SVN (using CVS for my previous projects) and it is driving me crazy.

Well, I was able to get the source from the SVN the SVN way (not by getting the zip). I was able to make a new SVN repository, and get the CHDK code in there.
However, after I copy some older code (the code I was working on) and do an update, my old code is untouched, and none of the new stuff is added. I am using TortoiseSVN.

So the question is, how do I update my working copies with the current SVN code?
Logged
*

Offline reyalp

  • ******
  • 14128
Re: SVN makes me cry
« Reply #1 on: 21 / September / 2009, 20:45:15 »
You shouldn't be making a repository, you should just be working in a working copy. Then just svn update when you need to. Tortoise will mark conflicts automatically merge non-conflicting changes when you update.

You could keep your platform/<camera> and loader/<camera> in your own repository if you want, but it may not be needed. For the SD990, I just svn added the files (without checking in) used tortoise to save patches at various points.

The svn book http://svnbook.red-bean.com/en/1.5/index.html is quite good.
Logged
Don't forget what the H stands for.
*

Offline HarpoMa

  • ***
  • 218
Re: SVN makes me cry
« Reply #2 on: 22 / September / 2009, 11:18:20 »
Give eclipse a try for your IDE.  It's wonderful imho.  Integrated SVN ect.

Harpo
Logged
Canon Models - SD300, SD780, & SX210
Pages: [1]   Go Up
« previous next »
 

Related Topics


SimplePortal © 2008-2014, SimplePortal