On Mon, Feb 07, 2011 at 11:59:23AM +0100, Andreas Schwab wrote: > Basile Starynkevitch <bas...@starynkevitch.net> writes: > The easiest way to get things going is to create a dummy merge in the > melt-branch that records the last svn merge you made. To do that you > need to find the last merged revision on the master branch and merge it > using the ours strategy. Then you can merge the master branch as usual. > > $ git merge -s ours bd785057b42734e859f64428467a673ee3c00372 > $ git merge master
Thanks a big lot. Apparently, something worked, but I cannot figure out how you got that bd785057b42734e859f64428467a673ee3c00372 SHA1 key. I thought it would appear in the git log output. I'm trying hard to understand how to reliably and painlessly merge trunk into the MELT branch. I am using the git mirror git://gcc.gnu.org/git/gcc.git but I don't understand well if I should use only it, or also git svn dcommit (which I do use). I also cannot figure out how to reliably get the Svn id of the trunk gotten by Git. With svnmerge, I had the information at the beginning of svnmerge-*.txt Regards, and many thanks. -- 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} ***
