This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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

Hello All,

Diego Novillo wrote:
I personally prefer to use svnmerge.py. It Just Works.

I suppose that svnmerge.py is the /usr/bin/svnmerge (at least, it seems to be last time I checked)

And Ben Elliston wrote:
> From time to time, you will run svnmerge merge.

That is what I think I did.

Regards, and thanks to both of you.

I added a small note on http://gcc.gnu.org/wiki/SvnMerge

Sorry for the noise.

Cheers.
--
Basile STARYNKEVITCH         http://starynkevitch.net/Basile/
email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359
8, rue de la Faiencerie, 92340 Bourg La Reine, France
*** opinions {are only mines, sont seulement les miennes} ***

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]