[asterisk-dev] [Code Review] 3192: chan_dahdi: handle DAHDI_EVENT_REMOVED on a pri D-Channel

[Richard Mudgett]

On Fri, Feb 7, 2014 at 7:20 AM, Tzafrir Cohen <tzafrir.cohen at xorcom.com>wrote:

> 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?
>

"svn merge" is a subcommand of svn itself.

"svnmerge" is a script that uses svn properties to guide how it uses "svn
merge".  In
this case there are no svn properties setup for this off-nominal merge path.

In your v1.8 svn workspace directory the commands to execute are:

To merge the main change:
svn merge -c394552 https://origsvn.digium.com/svn/asterisk .

To merge the spacing change for completeness:
svn merge -c394567 https://origsvn.digium.com/svn/asterisk .

Fixup any conflicts and compile problems from the merge.  I don't think
there
will be any.  A "svn status" of the v1.8 workspace should not show any
changes to the '.' directory.

Get the main change log message:
svn log -r394552 https://origsvn.digium.com/svn/asterisk > msg.txt

Edit msg.txt appropriately and add the note about the change being a
backport.

svn commit -F msg.txt

Then merge normally to the newer branches until v12 since the change is
already there.  If you did merge it to v12 anyway the resulting merge should
only have changes to the '.' directory svn properties.  Blocking the merge
to
v12 does not really accomplish much.

Richard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20140207/35d46401/attachment.html>