[asterisk-dev] [Code Review]: svnmerge: avoid a separator when merging a single commit

[Kevin Fleming]

> On Oct. 17, 2011, 1:48 p.m., Tilghman Lesher wrote:
> > /svnmerge, lines 1407-1412
> > <https://reviewboard.asterisk.org/r/1530/diff/1/?file=21252#file21252line1407>
> >
> >     Why not use this new syntax for both cases?
> 
> Tzafrir Cohen wrote:
>     While I personally like this better, this is indeed a matter for a different changeset.

I actually prefer the Merged-From format, with no separator between it and the original log message. My only concern about the changes we've made recently is that moving the 'merged from' information to the bottom of the commit message results in the merges being backwards... a commit to trunk lists the branch-1.8 revision it was merged from before the branch-10 revision it was merged from, which is not actually what happened.

If it's possible, I'd like see something like:

<commit message>

Merged-From: http://svn.asterisk.org/svn/asterisk/branches/10@333442
which was
Merged-From: http://svn.asterisk.org/svn/asterisk/branches/1.8@333441

Doing this, however, would require finding the top-most Merged-From line in the existing commit message and inserting the new Merged-From line in front of it. The 'which was' part is purely optional :-)


- Kevin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/1530/#review4519
-----------------------------------------------------------


On Oct. 17, 2011, 2 p.m., Tzafrir Cohen wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/1530/
> -----------------------------------------------------------
> 
> (Updated Oct. 17, 2011, 2 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Summary
> -------
> 
> If a merged commit only merges a single original revision, there is no use in adding a separator (........) at the end of the commit.
> 
> 
> Diffs
> -----
> 
>   /svnmerge 804 
> 
> Diff: https://reviewboard.asterisk.org/r/1530/diff
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Tzafrir
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20111018/cf7dfc05/attachment.htm>