Merge lp://staging/~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201010010719 into lp://staging/ubuntu/maverick/gvfs
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | 137 |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201010010719 |
| Merge into: | lp://staging/ubuntu/maverick/gvfs |
| Diff against target: |
140 lines (+85/-13) (has conflicts) 2 files modified
daemon/gvfsbackendsftp.c (+11/-13) debian/patches/git_backout_sftp_commit_c6be45c.patch (+74/-0) Conflict adding file debian/patches/git_backout_sftp_commit_c6be45c.patch. Moved existing file to debian/patches/git_backout_sftp_commit_c6be45c.patch.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201010010719 |
| Related bugs: |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/gvfs now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/gvfs/maverick-201010010719. A merge should be performed if necessary.
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
