Merge lp:~ibid-dev/ibid/factoid-544493 into lp:~ibid-core/ibid/old-trunk-1.6
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Stefano Rivera | ||||
Proposed branch: | lp:~ibid-dev/ibid/factoid-544493 | ||||
Merge into: | lp:~ibid-core/ibid/old-trunk-1.6 | ||||
Prerequisite: | lp:~stefanor/ibid/regexp-595423 | ||||
Diff against target: |
248 lines (+89/-40) (has conflicts) 1 file modified
ibid/plugins/factoid.py (+89/-40) Text conflict in ibid/plugins/factoid.py |
||||
To merge this branch: | bzr merge lp:~ibid-dev/ibid/factoid-544493 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ibid Dev Team | Pending | ||
Stefano Rivera | Pending | ||
Michael Gorven | Pending | ||
Review via email: mp+47292@code.launchpad.net |
This proposal supersedes a proposal from 2010-03-27.
Description of the change
Fix deletion of factoids containing args.
Unmerged revisions
- 930. By Stefano Rivera
-
Merged regexp-595423
- 929. By Stefano Rivera
-
Use # as escape to get around all LIKE escaping issues
- 928. By Stefano Rivera
-
Use # as escape to get around all LIKE escaping issues
- 927. By marcog
-
Return number of values known for append when given index is too large
- 926. By marcog
-
all or literal -> all
- 925. By marcog
-
Make factoid search aware of args (for non-regex searches)
- 924. By marcog
-
All implies literal, so set it on top rather than check continuously
- 923. By marcog
-
Go through the 2nd pass of get_factoid() when no matches found in the 1st pass
- 922. By marcog
-
Report number of matches in factoid searching when outside the range
- 921. By marcog
-
Fix start/limit bounds for factoid searching
This appears to work. I hope I understand what it's doing. :)