Comments on: Revision Control with SVN http://blog.froglogic.com/2007/05/revision-control-with-svn/ A company weblog Wed, 08 Sep 2010 06:07:58 +0000 http://wordpress.org/?v=2.5 By: catherine http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-24327 catherine Fri, 19 Jun 2009 06:24:22 +0000 http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-24327 Thanks for your article. Catherine Sea http://www.scmsoftwareconfigurationmanagement.com Thanks for your article.

Catherine Sea
http://www.scmsoftwareconfigurationmanagement.com

]]> By: Jason Voegele http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-431 Jason Voegele Mon, 14 May 2007 15:23:57 +0000 http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-431 I think svnmerge.py is what you are looking for: http://www.orcaware.com/svn/wiki/Svnmerge.py I think svnmerge.py is what you are looking for:

http://www.orcaware.com/svn/wiki/Svnmerge.py

]]> By: Frerich Raabe http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-430 Frerich Raabe Mon, 14 May 2007 09:39:42 +0000 http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-430 > If what you’re looking for is “the last change I committed”, you want the diff between > PREV:COMMITTED. I.e., svn merge -r PREV:COMMITTED wc1 wc2. When using -r PREV:COMMITTED, I have to specify the single files to merge though, right? One thing I like about the current implementation is that I can just specify a target directory and then it'll integrate all the changes done in the given revision into that target directory. > If what you’re looking for is “the last change I committed”, you want the diff between
> PREV:COMMITTED. I.e., svn merge -r PREV:COMMITTED wc1 wc2.

When using -r PREV:COMMITTED, I have to specify the single files to merge though, right? One thing I like about the current implementation is that I can just specify a target directory and then it’ll integrate all the changes done in the given revision into that target directory.

]]> By: Thiago Macieira http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-417 Thiago Macieira Sat, 12 May 2007 09:37:19 +0000 http://blog.froglogic.com/2007/05/revision-control-with-svn/#comment-417 Hey Frerich Subversion special revisions are: HEAD = current latest revision in the repository BASE = the revision you checked out COMMITTED = the last changed revision of a given file or directory PREV = COMMITTED-1 So, let's suppose there's a file called foo.c that was changed in revision 91. When you did "svn up" you got revision 100. At this point, it's: HEAD = BASE = 100 COMMITTED = 91 PREV = 90 Then a co-worker (let's call him Harri) comes and makes a modification somewhere in the repository. HEAD advances to 101. But your BASE doesn't, because you haven't run "svn up" again. If what you're looking for is "the last change I committed", you want the diff between PREV:COMMITTED. I.e., svn merge -r PREV:COMMITTED wc1 wc2. One more thing: Subversion 1.5 will include branch/merge management. Hey Frerich

Subversion special revisions are:
HEAD = current latest revision in the repository
BASE = the revision you checked out
COMMITTED = the last changed revision of a given file or directory
PREV = COMMITTED-1

So, let’s suppose there’s a file called foo.c that was changed in revision 91. When you did “svn up” you got revision 100. At this point, it’s:
HEAD = BASE = 100
COMMITTED = 91
PREV = 90

Then a co-worker (let’s call him Harri) comes and makes a modification somewhere in the repository. HEAD advances to 101. But your BASE doesn’t, because you haven’t run “svn up” again.

If what you’re looking for is “the last change I committed”, you want the diff between PREV:COMMITTED. I.e., svn merge -r PREV:COMMITTED wc1 wc2.

One more thing: Subversion 1.5 will include branch/merge management.

]]>