Merge lp://staging/~ignacio-nin/percona-server/5.6-bug1167109 into lp://staging/percona-server/5.6
Proposed by
Ignacio Nin
| Status: | Merged |
|---|---|
| Approved by: | Laurynas Biveinis |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 338 |
| Proposed branch: | lp://staging/~ignacio-nin/percona-server/5.6-bug1167109 |
| Merge into: | lp://staging/percona-server/5.6 |
| Prerequisite: | lp://staging/~ignacio-nin/percona-server/5.6-bug1165098 |
| Diff against target: |
43 lines (+5/-0) (has conflicts) 1 file modified
build/percona-server.spec (+5/-0) Path conflict: <deleted> / build/debian/docs Conflict: can't delete build.moved because it is not empty. Not deleting. Conflict adding file build. Moved existing file to build.moved. Conflict because build.moved is not versioned, but has versioned children. Versioned directory. Path conflict: build.moved/build-binary.sh / build/build-binary.sh Path conflict: build.moved/build-dpkg.sh / build/build-dpkg.sh Path conflict: build.moved/build-rpm.sh / build/build-rpm.sh Conflict: can't delete build.moved/debian because it is not empty. Not deleting. Conflict because build.moved/debian is not versioned, but has versioned children. Versioned directory. |
| To merge this branch: | bzr merge lp://staging/~ignacio-nin/percona-server/5.6-bug1167109 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Laurynas Biveinis (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix for bug #1167109, on top of the file-ids fix
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The patch is OK, the path conflicts are suspicious but should have been resolved at the prerequisite branch, will need checking at the merge time.