* tools/dist/backport.pl
  (shell_escape): Return a scalar when not in list context.  Before this,
    the first call in merge() sometimes got '1' instead of the branch name.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1592713 13f79535-47bb-0310-9956-ffa450edef68
backport.pl: Fix a bug in the $parno-based STATUS editing logic.

This also changes the approach to the "edit the file while this process is
reading it" issue: as of this revision, we'll copy STATUS to a tempfile,
edit that, and move-into-place.

The bug was added in r1569235 and described in
<http://mail-archives.apache.org/mod_mbox/subversion-dev/201404.mbox/%3C20140417111215.GB1802@tarsus.local2%3E>.
The codepath was barred in r1589871 (which this revision reverts).

* tools/dist/backport.pl
  (@MERGES_TODAY): New global.
  (merge): Adjust $parno for already-run merges.
    When editing STATUS, replace it rather than edit it in-place.
    Record merges in @MERGES_TODAY as they are performed.
  (handle_entry): Remove comment that warns about a now-fixed problem.
  (): Revert r1589871's disabling of the $MAY_COMMIT codepath.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1592714 13f79535-47bb-0310-9956-ffa450edef68