Merge lp:~jjo/bash-completion/fix-bash43-quote_readline_by_ref-tilde-and-double_escaping into lp:ubuntu/trusty/bash-completion
Proposed by
JuanJo Ciarlante
Status: | Rejected |
---|---|
Rejected by: | Martin Pitt |
Proposed branch: | lp:~jjo/bash-completion/fix-bash43-quote_readline_by_ref-tilde-and-double_escaping |
Merge into: | lp:ubuntu/trusty/bash-completion |
Diff against target: |
48 lines (+24/-1) (has conflicts) 2 files modified
bash_completion (+11/-1) debian/patches/words_bad_array_subscript.patch (+13/-0) Conflict adding file debian/patches/words_bad_array_subscript.patch. Moved existing file to debian/patches/words_bad_array_subscript.patch.moved. |
To merge this branch: | bzr merge lp:~jjo/bash-completion/fix-bash43-quote_readline_by_ref-tilde-and-double_escaping |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Disapprove | ||
Review via email: mp+210421@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 48. By JuanJo Ciarlante
-
use string replacing instead of eval to replace double-escaping by single-escaping
- 47. By JuanJo Ciarlante
-
fix also lp# 1288031: avoid quoting if empty
- 46. By JuanJo Ciarlante
-
[jjo, r=] fix _quote_
readline_ by_ref to avoid escaping 1st '~', and re-eval to fix double escaping - 45. By j
-
* debian/
patches/ words_bad_ array_subscript .patch
- Fix bash: words: bad array subscript (lp: #1289597)
Hello JuanJo,
thanks for these fixes! However, the debian/ patches/ words_bad_ array_subscript .patch bit collides with a different fix from Jan Gerber (bug 1289597), so this needs to be dropped.
The other changes need to be done as proper debian/patches/, too (and separated by issue if possible). Did you author them? If yes, can you please send them to upstream? If no, where did you get them from? We need this to track the patch and get it into Debian and Upstream, as it's certainly not Ubuntu specific.
Please set back the status (at the top of the page) to "needs review" when this is sorted out.
Thank you!