Merge lp://staging/~alex-idereal/bzr-xmloutput/fix-xmlmissing-exception into lp://staging/bzr-xmloutput
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~alex-idereal/bzr-xmloutput/fix-xmlmissing-exception |
| Merge into: | lp://staging/bzr-xmloutput |
| Diff against target: |
478 lines (+236/-47) 10 files modified
info.py (+1/-1) installer/bzr-xmloutput-setup.nsi (+1/-1) lsxml.py (+22/-5) missingxml.py (+1/-1) service.py (+40/-6) shelvexml.py (+15/-11) tagsxml.py (+23/-19) tests/test_ls_xml.py (+59/-1) tests/test_progress.py (+48/-0) uifactory.py (+26/-2) |
| To merge this branch: | bzr merge lp://staging/~alex-idereal/bzr-xmloutput/fix-xmlmissing-exception |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Guillermo Gonzalez | Pending | ||
|
Review via email:
|
|||
Description of the change
missingxml: Don't throw exception if local branch has no parent.
Use other_branch to fill in <last_location> URL instead of parent.
This seems correct since it's the branch being used to calculate what's missing, and it avoids an exception when parent is None. Hopefully nothing depends on the previous broken behaviour.
Unmerged revisions
- 183. By Alexander Taler
-
missingxml: Don't throw exception if local branch has no parent.
Use other_branch to fill in <last_location> URL instead of parent.
This seems correct since it's the branch being used to calculate what's missing, and it avoids an exception when parent is None. Hopefully nothing depends on the previous broken behaviour.
- 182. By Piotr Piastucki
-
Increase version number to 0.9.1
- 181. By Piotr Piastucki
-
Merge lp:~rom1-chal/bzr-xmloutput/bugfix-persistent-ssh
Add an experimental workaround for bzr not closing ssh connections.
This is not a real fix but it seems to work. - 180. By Piotr Piastucki
- 179. By Piotr Piastucki
- 178. By Piotr Piastucki
-
Sync with main branch
- 177. By Piotr Piastucki
-
Merge lp:~piastucki/bzr-xmloutput/fix-551351-ignored-in-symlink-root
- 176. By Piotr Piastucki
-
Fix handling of files with execute bit changed in xmlstatus
Introduce new attribute called meta_modfied instead of changing the file path and appending an asterisk for files with changes in execute bit. - 175. By Piotr Piastucki
-
Fix no _encoding attribute issue due to changes between bzr 2.6b1 and 2.6b3
- 174. By Alexander Taler
-
Increase version number to 0.9.0.
To support bzr-eclipse release 1.2.0
