On Thu, Feb 06, 2014 at 07:04:39PM -0000, rmudgett wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviewboard.asterisk.org/r/3192/#review10796 > ----------------------------------------------------------- > > Ship it! > > > Use svn merge to backport the revisions -r394552 and -r394567 for the patch > so comparing the files between version does not show up unnecessary > differences. Also you should use the commit message from -r394552 adding a > note indicating that the change was backported.
How do I do that? I tried: $ ~/bin/svnmerge merge -r394552 --source https://origsvn.digium.com/svn/asterisk/trunk svnmerge: no integration info available for path "/trunk" Or should I just mark it as blocked in branch 12 (also in trunk)? Someone on IRC suggested using svn merge: $ svn merge https://origsvn.digium.com/svn/asterisk/trunk@394551 https://origsvn.digium.com/svn/asterisk/trunk@394552 . Are svn merge and svnmerge compatible? -- Tzafrir Cohen icq#16849755 jabber:[email protected] +972-50-7952406 mailto:[email protected] http://www.xorcom.com -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
