[gc-improv] Copy current trunk to branch
NightStrike
nightstrike@gmail.com
Thu Jan 20 15:54:00 GMT 2011
On Thu, Jan 20, 2011 at 1:10 AM, Laurynas Biveinis
<laurynas.biveinis@gmail.com> wrote:
> 2011/1/19 Laurynas Biveinis <laurynas.biveinis@gmail.com>:
>> $ svn cp svn+ssh://lauras@gcc.gnu.org/svn/gcc/trunk
>> svn+ssh://lauras@gcc.gnu.org/svn/gcc/branches/gc-improv -m "Rebase
>> gc-improv branch on current trunk"
>
> Apparently this copying of the trunk to the branch didn't do what I
> wanted it to do, so after some searching I did what Ian did for gccgo
> - deleted the branch then copied.
>
> $ svn rm svn+ssh://lauras@gcc.gnu.org/svn/gcc/branches/gc-improv -m
> "Temporarily remove the branch before re-creating it"
> Committed revision 169048.
> $ svn cp svn+ssh://lauras@gcc.gnu.org/svn/gcc/trunk
> svn+ssh://lauras@gcc.gnu.org/svn/gcc/branches/gc-improv -m "Rebase
> gc-improv branch on current trunk"
>
> Committed revision 169049.
>
>
> --
> Laurynas
>
For reference:
"In Subversion 1.5, once a --reintegrate merge is done from branch to
trunk, the branch is no longer usable for further work. It's not able
to correctly absorb new trunk changes, nor can it be properly
reintegrated to trunk again. For this reason, if you want to keep
working on your feature branch, we recommend destroying it and then
re-creating it from the trunk:"
Bottom of this section:
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync
Now in the 1.6 version, the text later on describes how to actually do
it if you really wanted to:
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
More information about the Gcc-patches
mailing list