This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Please, do not use the merged revisions log as the commit message when merging
* Manuel López-Ibáñez wrote on Tue, Aug 26, 2008 at 11:13:19AM CEST:
>
> http://gcc.gnu.org/wiki/SvnBranch
Thanks. Then I suggest this patch.
Cheers,
Ralf
Index: htdocs/svnwrite.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/svnwrite.html,v
retrieving revision 1.15
diff -u -r1.15 svnwrite.html
--- htdocs/svnwrite.html 19 Jan 2007 21:04:10 -0000 1.15
+++ htdocs/svnwrite.html 26 Aug 2008 09:21:28 -0000
@@ -28,7 +28,7 @@
<li><a href="#testing">Testing changes</a></li>
<li><a href="#checkin">Checking in a change</a></li>
<li><a href="#example">Example check-in session</a></li>
- <li><a href="#branches">Creating branches</a></li>
+ <li><a href="#branches">Creating and using branches</a></li>
</ol>
<hr />
@@ -384,7 +384,7 @@
<p>And that's it!</p>
<hr />
-<h2><a name="branches">Creating branches</a></h2>
+<h2><a name="branches">Creating and using branches</a></h2>
<p>To create a branch for development, simply copy the trunk directory
to a directory in /branches as follows:</p>
@@ -398,5 +398,11 @@
<a href="svn.html#devbranches">svn.html#devbranches</a>.
</p>
+<p>When merging changes from mainline (or another branch) to a branch,
+do not copy the entire set of ChangeLog entries. Just use something
+like "Merge from mainline" or similar. For more information on how to
+deal with branches, see <a href="http://gcc.gnu.org/wiki/SvnBranch">the
+wiki page on branches</a>.</p>
+
</body>
</html>