Merge lp://staging/collectionista/alpha into lp://staging/collectionista
Proposed by
pjv
| Status: | Merged | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 220 | ||||||||||||||||||||||||||||||||
| Proposed branch: | lp://staging/collectionista/alpha | ||||||||||||||||||||||||||||||||
| Merge into: | lp://staging/collectionista | ||||||||||||||||||||||||||||||||
| Diff against target: |
110875 lines (has conflicts)
Conflict: can't delete src/net/lp/collectionista/ui because it is not empty. Not deleting. Conflict because src/net/lp/collectionista/ui is not versioned, but has versioned children. Versioned directory. Contents conflict in src/net/lp/collectionista/ui/Collectionista.java |
||||||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/collectionista/alpha | ||||||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| pjv | Approve | ||
|
Review via email:
|
|||
Description of the change
Alpha is done, ready to go to beta in the original branch. Need to change many directories (package names) and throw away stale files.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
