| commit | 0b4347f2cb2c5b0d39c9f0f3260182cb5e36213a | [log] [tgz] |
|---|---|---|
| author | Daniel Shahaf <danielsh@apache.org> | Fri Aug 02 12:12:04 2013 +0000 |
| committer | Daniel Shahaf <danielsh@apache.org> | Fri Aug 02 12:12:04 2013 +0000 |
| tree | 23591337770279ab5eee2011e1a4cd3f9bde3cff | |
| parent | f1a6494c4f9d91064fdb4c6d131ba35f3ee4ba0d [diff] |
backport.pl: guard against ambiguous --accept specifications.
* tools/dist/backport.pl
(parse_entry): Detect multiple --accept specifications, warn about them,
and ignore the conflicting values (so that the merge, later on, will
conflict).
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1509649 13f79535-47bb-0310-9956-ffa450edef68