This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: merging trunk into MELT branch: svn merge or svnmerge merge?
- From: Diego Novillo <dnovillo at google dot com>
- To: Basile STARYNKEVITCH <basile at starynkevitch dot net>
- Cc: GCC Mailing List <gcc at gcc dot gnu dot org>
- Date: Fri, 29 Feb 2008 15:41:51 -0500
- Subject: Re: merging trunk into MELT branch: svn merge or svnmerge merge?
- References: <47C86C94.6070701@starynkevitch.net>
On 2/29/08 3:35 PM, Basile STARYNKEVITCH wrote:
Ideally either a reference or the full sequence of commands to run would
be helpful (assuming I can restart from pristine MELT branch & trunk)
I personally prefer to use svnmerge.py. It Just Works. There is a
short tutorial on the GCC wiki somewhere (sorry, I forget exactly where).
Once initialized, doing a merge is just a matter of executing
'svnmerge.py merge'. It even leaves a merge log file for you to use in
your commit message (I use it to get the revision numbers).
I have never used 'svn merge', so I cannot really give you an unbiased
opinion.
Diego.