merging trunk into MELT branch: svn merge or svnmerge merge?

[Diego Novillo]

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.