This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Warning for future branch merges TO mainline
- From: Jeff Law <law at redhat dot com>
- To: Richard Henderson <rth at redhat dot com>
- Cc: "gcc at gcc dot gnu dot org" <gcc at gcc dot gnu dot org>
- Date: Tue, 13 Oct 2009 12:43:52 -0600
- Subject: Re: Warning for future branch merges TO mainline
- References: <4AD4BA1B.8090806@redhat.com>
On 10/13/09 11:34, Richard Henderson wrote:
Managing branches with svnmerge is nice and friendly. Certainly much
easier than doing it by hand. However, when it comes time to
integrate that branch into mainline, one must use more caution.
If you use svnmerge on your branch, and then integrate the branch to
mainline with "svn merge" (as opposed to applying a patch), then
please Please PLEASE remove all of the "svn:mergeinfo" properties that
get brought in before you do the commit. Failure to do so will cause
all sorts of problems the next time someone tries to merge from trunk
out to a branch.
I've just removed all of the errant properties from trunk.
Probably belongs on this page in the wiki:
http://gcc.gnu.org/wiki/SvnBranch
Jeff