RE: [PATCH v1] Remove no-op revisions
Jon Foster <[email protected]> Thu, 8 Apr 2010 18:40:33 +0100
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi, Michael Haggerty wrote: > you might think of writing a FAQ entry describing the problem that > the script solves and giving a pointer to the tool. If you do so, > please submit it as a patch to www/faq.html. As requested, here's the FAQ patch. Is this what you had in mind? Also, please could you do: svn propset svn:executable y contrib/renumber_branch.py to make the script executable? Kind regards, Jon ********************************************************************** This email and its attachments may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Cabot Communications Ltd. If you are not the intended recipient of this email and its attachments, you must take no action based upon them, nor must you copy or show them to anyone. Cabot Communications Limited Verona House, Filwood Road, Bristol BS16 3RY, UK +44 (0) 1179584232 Co. Registered in England number 02817269 Please contact the sender if you believe you have received this email in error. ********************************************************************** ______________________________________________________________________ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email ______________________________________________________________________ ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2523917 To unsubscribe from this discussion, e-mail: [[email protected]].
cvs2svn_renumber_branch_doc_patch.txt
(text/plain, 2.9 KB)
Index: www/faq.html
===================================================================
--- www/faq.html (revision 5107)
+++ www/faq.html (working copy)
@@ -95,6 +95,10 @@
command '['co', '-q', '-x,v', '-p1.1', '-kk',
'/home/cvsroot/myfile,v']' failed" in pass 8.</a></li>
+ <li><a href="#nonstandardntdb">Vendor branches created with
+ "cvs import -b <branch number>" are not correctly
+ handled.</a></li>
+
</ol>
@@ -975,6 +979,60 @@
href="cvs2svn.html#use-cvs"><tt>--use-cvs</tt></a> option.</p>
+<h3><a name="nonstandardntdb" title="#nonstandardntdb">Vendor
+ branches created with "cvs import -b <branch number>"
+ are not correctly handled.</a></h3>
+
+<p>Normally, people using "cvs import" don't specify the
+"-b" flag. cvs2svn handles this normal case fine.</p>
+
+<p>If you have a file which has an <i>active</i> vendor branch, i.e.
+there have never been any trunk commits but only "cvs imports" onto
+the vendor branch, then cvs2svn will handle this fine. (Even if
+you've used the "-b" option to specify a non-standard branch
+number).</p>
+
+<p>If you've used "cvs import -b <branch number>", you didn't
+specify the standard CVS vendor branch number of 1.1.1, and there
+has since been a commit on trunk (either a modification or delete),
+then your history has been damaged. This isn't cvs2svn's fault.
+CVS simply doesn't record the branch number of the old vendor branch,
+it assumes it was 1.1.1. You will even get the wrong results from
+"cvs checkout -D" with a date when the vendor branch was active.</p>
+
+<p>Symptoms of this problem can include:</p>
+
+<ul>
+<li>cvs2svn refusing to let you exclude the vendor branch, because
+some other branch depends on it</li>
+<li>if you did more than one import onto the vendor branch, then
+your SVN history "missing" one of the changes on trunk (though
+the change will be on the vendor branch).</li>
+</ul>
+
+<p>(Note: There are other possible causes for these symptoms, don't
+assume you have a non-standard vendor branch number just because
+you see these symptoms).</p>
+
+<p>The way to solve this problem is to renumber the vendor branch to
+the standard 1.1.1 branch number. This has to be done before you run
+cvs2svn. To help you do this, there is the "renumber_branch.py"
+script in the "contrib" directroy of the cvs2svn distribution.</p>
+
+<p>The typical usage, assuming you used "cvs import -b 1.1.2 ..."
+to create your vendor branch, is:</p>
+<pre>
+ contrib/renumber_branch.py 1.1.2 1.1.1 repos/dir/file,v
+</pre>
+<p>You should only run this on a <b>copy</b> of your CVS repository,
+as it edits the repository in-place. You can fix a single file or a
+whole directory tree at a time.</p>
+
+<p>The script will check that the 1.1.1 branch doesn't already exist;
+if it does exist then it will fail with an error message.</p>
+
+
+
<h2>Getting help:</h2>
<h3><a name="gettinghelp" title="#gettinghelp">How do I get