(r3) CVS2SVNQuickReference < LHCb

LHCb Web>LHCbComputing>SVNUsageGuidelines>CVS2SVNQuickReference (revision 3) (raw view)~~EditAttachPDF~~

---+!! Quick reference for CVS users moving to SVN
The LHCb code is kept in a [[http://subversion.tigris.org/][Subversion]] [[http://svn.web.cern.ch/svn/][repository]] (currently being migrated from CVS). 

For instructions about the usage of the SVN repository, look at SVNUsageGuidelines. 

---++!! Table of Contents
%TOC%

---++ commands

%TABLE{ sort="off" tableborder="0" cellpadding="1" cellspacing="3" headerbg="#6062b0" databg="#FAF0D4, #c9ffae"}%
| *cvs* | *svn* | *Description* |
| *update -A* | update | update your local copy to what is on the head |
| *-N update -A* | info | the status of the local repository and what's on the head |
| *diff * | info | if you just want to know what the current revision is |
| *diff -r * | diff -r | difference to a separate revision, or between two different repository locations [[http://svnbook.red-bean.com/en/1.0/re09.html][handy link]] |

---++ tagging

Users do not need to tag anything in SVN, the revision number you get when modifying the SVN repository is the same.

Release managers can use the basic svn cp, svn rm, etc commands to fiddle around with the tags rather than the trunk, and/or can use the tag_package script to copy the current trunk to the tags directory.

---++ I have a problem comitting, what's wrong?

Do you see this:

%SYNTAX{ syntax="sh"}%
svn: Commit blocked by pre-commit hook (exit code 1) with output:
Cannot modify files in tags directories
%ENDSYNTAX%
??

If so you've probably done the getpack of the tag instead of the trunk. Not a good idea unless you want to create a branch, because create a branch is what you've just done, unknowingly.

%SYNTAX{ syntax="sh"}%
>svn info
....../tags/..../vXrY
%ENDSYNTAX%


You have two choices:

   1 Getpack the trunk instead and make your changes there
   1 Try to merge your changes with svn

For (2) first switch to the trunk:

%SYNTAX{ syntax="sh"}%
>svn switch ....../trunk/....  .
> svn update 
#fix conflicts, if this is not possible, you've made a branch, get in touch with the release manager!
> svn commit -m 'merged my changes onto the trunk'
%ENDSYNTAX%

-- Main.RobLambert - 22-Apr-2010

Topic revision: r3 - 2010-05-04 - RobLambert

LHCb

Public webs

Welcome Guest

- Cern Search
- TWiki Search
- Google Search
LHCb All webs

Copyright &© 2008-2021 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
or Ideas, requests, problems regarding TWiki? use Discourse or Send feedback