Merge lp://staging/~dale-f-beaudoin/unity-control-center/security_privacy into lp://staging/unity-control-center
Proposed by
ventrical
| Status: | Rejected |
|---|---|
| Rejected by: | Jeremy Bícha |
| Proposed branch: | lp://staging/~dale-f-beaudoin/unity-control-center/security_privacy |
| Merge into: | lp://staging/unity-control-center |
| Diff against target: |
41 lines (+13/-0) (has conflicts) 2 files modified
debian/changelog (+12/-0) debian/control (+1/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~dale-f-beaudoin/unity-control-center/security_privacy |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Control Center development team | Pending | ||
|
Review via email:
|
|||
Commit message
inserted activity-
Description of the change
insert activity-
To post a comment you must log in.
Revision history for this message
| ventrical (dale-f-beaudoin) wrote | # |
Unmerged revisions
- 12901. By dale_f_beaudoin <email address hidden>
-
--message
* recommend activity-log-manager
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
still got text conflict in changelog
Here is what I have been following from Seb
The steps would be basically
$ bzr branch lp:unity-control-center
$ cd unity-control-
$ editor debian/rules
do your changes
$ dch -i
write your changelog entry
$ bzr commit
$ bzr push lp:~<USER_ID>
where USER_ID is your launchpad user id and BRANCH_NAME a name for your work
$ bzr lp-open
and do the merge proposal from the UI
and
-------
Some comments though
- "unity7maintainers" doesn't really describe your branch, usually you would pick a name that explains what the change do, e.g "update-
- your commit message is not really good (see on the webpage mentioned earlier)
"--message
modified:
debian/changelog
debian/rules"
the commit should explain the change, copying what you wrote in the debian/changelog is a common practice there
So that is what I did but , as I mentioned to Seb , it seems that nano is really borking up the changelog. Ill keep trying..