Merge lp:~danielturcanu/zorba/mytrunk into lp:zorba
Proposed by
Daniel Turcanu
Status: | Superseded |
---|---|
Proposed branch: | lp:~danielturcanu/zorba/mytrunk |
Merge into: | lp:zorba |
Diff against target: |
89 lines (+9/-4) (has conflicts) 7 files modified
ChangeLog (+4/-0) src/diagnostics/dict_XX_cpp.xq (+1/-0) src/diagnostics/pregenerated/dict_en.cpp (+1/-0) src/runtime/strings/strings_impl.cpp (+1/-1) src/zorbatypes/URI.cpp (+0/-3) test/rbkt/ExpQueryResults/zorba/string/Regex/regex_a4.xml.res (+1/-0) test/rbkt/Queries/zorba/string/Regex/regex_a4.xq (+1/-0) Text conflict in ChangeLog |
To merge this branch: | bzr merge lp:~danielturcanu/zorba/mytrunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Needs Fixing | ||
Matthias Brantner | Needs Information | ||
Review via email: mp+78996@code.launchpad.net |
This proposal has been superseded by a proposal from 2011-10-12.
Commit message
fn:analyze-string fix
Description of the change
fn:analyze-string fix
To post a comment you must log in.
What is the file test/rbkt/ Queries/ zorba/resolving /path_to_ uri.xq supposed to test. It imports the file module but doesn't use it.