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
- From: Gerald Pfeifer <gerald at pfeifer dot com>
- To: Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>
- Cc: Daniel Berlin <dberlin at dberlin dot org>, John Freeman <jfreeman at cs dot tamu dot edu>, gcc at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Sat, 23 Aug 2008 21:17:05 +0200 (CEST)
- Subject: Re: Please, do not use the merged revisions log as the commit message when merging
- References: <20080816150259.GA28988@ednor.casa.cgf.cx> <48A86EC4.8050909@cs.tamu.edu> <4aca3dc20808171218x7d090eefi1172d6efb92dba31@mail.gmail.com> <20080817200410.GB31815@ins.uni-bonn.de>
On Sun, 17 Aug 2008, Ralf Wildenhues wrote:
> It should be on svnwrite.html
Something like the following? (Not committed yet.)
Gerald
Index: svnwrite.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/svnwrite.html,v
retrieving revision 1.15
diff -u -3 -p -r1.15 svnwrite.html
--- svnwrite.html 19 Jan 2007 21:04:10 -0000 1.15
+++ svnwrite.html 23 Aug 2008 19:16:32 -0000
@@ -28,7 +28,7 @@ www documents is still done using <a hre
<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 @@ Committed revision 105933.
<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,9 @@ svn cp svn+ssh://<i>username</i>@gcc.gnu
<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.</p>
+
</body>
</html>