Merge lp://staging/~bzr-unbunt/bzr4j/subbranch-fix into lp://staging/bzr4j
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~bzr-unbunt/bzr4j/subbranch-fix |
| Merge into: | lp://staging/bzr4j |
| Prerequisite: | lp://staging/~frankoid/bzr4j/idea11-fixes |
| Diff against target: |
137 lines (+43/-12) 1 file modified
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrChangeProvider.java (+43/-12) |
| To merge this branch: | bzr merge lp://staging/~bzr-unbunt/bzr4j/subbranch-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Patrick Woodworth | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixes incorrect handling of nested branches as reported in bug #727294.
The changes were tested in the current IDEA trunk (11.x) and PhpStorm 3.0.1.
With these the file status of nested branches is shown correctly in the Project tool window. Also the Changes tool window now reports changes in nested branches correctly.
Unmerged revisions
- 61. By Harry Hirsch
-
Honour branch boundaries when determining ignored/unversion status of files
- 60. By Francis Devereux
-
Update <change-notes> in plugin.xml and bump version to 2.6.2-SNAPSHOT
- 59. By Francis Devereux
-
Add methods to BzrAnnotation to fix compilation against IntelliJ IDEA 11.0
- 58. By Francis Devereux
-
Add Set<String> feedback argument to BzrCheckinEnvir
onment. commit so that it compiles against IntelliJ IDEA 11.0 - 57. By Francis Devereux
-
Form changes made automatically when building with IntelliJ 11.0
- 56. By Francis Devereux
-
Update BzrFileRevision to compile against IntelliJ IDEA 11.0 SDK and to use ContentRevision
Cache - 55. By Francis Devereux
-
VcsUtil.
showErrorMessag e has moved to VcsImplUtil - 54. By Francis Devereux
-
Fixed IDEA 10 (latest git as of 14 Feb 2011) compile errors
