Merge lp:~dale-f-beaudoin/unity-control-center/security_privacy into lp:unity-control-center

Proposed by ventrical on 2017-09-30
Status: Rejected
Rejected by: Jeremy Bicha on 2017-09-30
Proposed branch: lp:~dale-f-beaudoin/unity-control-center/security_privacy
Merge into: lp: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:~dale-f-beaudoin/unity-control-center/security_privacy
Reviewer Review Type Date Requested Status
Unity Control Center development team 2017-09-30 Pending
Review via email: mp+331618@code.launchpad.net

Commit message

inserted activity-log-manager as a recommend in debian/control

Description of the change

insert activity-log-manager

To post a comment you must log in.
ventrical (dale-f-beaudoin) wrote :

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-center
$ editor debian/rules

do your changes

$ dch -i

write your changelog entry

$ bzr commit
$ bzr push lp:~<USER_ID>/unity-control-center/<BRANCH_NAME>

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-distro-serie"

- 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..

Unmerged revisions

12901. By dale_f_beaudoin <email address hidden> on 2017-09-30

--message
* recommend activity-log-manager

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-09-06 14:40:51 +0000
3+++ debian/changelog 2017-09-30 19:39:20 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 unity-control-center (15.04.0+17.10.20170814.1-0ubuntu2) artful; urgency=medium
7
8 * debian/control: use 'X-Ubuntu-Use-Langpack: yes' since the indicator
9@@ -9,9 +10,20 @@
10 unity-control-center (15.04.0+17.10.20170814.1-0ubuntu1) artful; urgency=medium
11
12 [ ventrical ]
13+=======
14+ * recommend activity-log manager
15+
16+unity-control-center (15.04.0+17.10.20170810-0ubuntu3) UNRELEASED; urgency=medium
17+
18+>>>>>>> MERGE-SOURCE
19 * Replace version number from 17.04 to 17.10
20+ *
21
22+<<<<<<< TREE
23 -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 14 Aug 2017 16:11:40 +0000
24+=======
25+ -- ventrical <ventrical@ventrical-MS-7798> Fri, 29 Sep 2017 15:48:34 -0400
26+>>>>>>> MERGE-SOURCE
27
28 unity-control-center (15.04.0+17.10.20170810-0ubuntu1) artful; urgency=medium
29
30
31=== modified file 'debian/control'
32--- debian/control 2017-09-06 14:40:35 +0000
33+++ debian/control 2017-09-30 19:39:20 +0000
34@@ -93,6 +93,7 @@
35 libcanberra-pulse,
36 system-config-printer,
37 gnome-control-center-faces,
38+ activity-log-manager,
39 Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
40 gnome-control-center-unity,
41 unity-control-center-datetime

Subscribers

People subscribed via source and target branches