GTG

Merge lp:~gtg-user/gtg/urgency-coding-api into lp:~gtg-user/gtg/urgency-color-api

Proposed by Wolter HV
Status: Merged
Merged at revision: 1064
Proposed branch: lp:~gtg-user/gtg/urgency-coding-api
Merge into: lp:~gtg-user/gtg/urgency-color-api
Diff against target: 13 lines (+2/-1)
1 file modified
GTG/plugins/urgency_color/urgency_color.py (+2/-1)
To merge this branch: bzr merge lp:~gtg-user/gtg/urgency-coding-api
Reviewer Review Type Date Requested Status
Wolter HV Approve
Review via email: mp+93751@code.launchpad.net

Description of the change

Accidentally pushed a revision to the urgency-coding-api branch, when it was previously moved to urgency-color-api, thus recreating it. This merge's purpose is to have both branches with the same revision to be able to subsequently delete the urgency-coding-api, which is merely the old name of the urgency-color-api branch.

To post a comment you must log in.
Revision history for this message
Wolter HV (wolterh) wrote :

I am the main developer in both branches, so I will approve this merge proposal.

review: Approve
Revision history for this message
Izidor MatuĊĦov (izidor) wrote :

For the record: When you merge your branches from one to another, you don't need to create merge request. It is designed for cases when you don't have permission to do it/you want other people to review your changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GTG/plugins/urgency_color/urgency_color.py'
2--- GTG/plugins/urgency_color/urgency_color.py 2012-02-03 08:21:03 +0000
3+++ GTG/plugins/urgency_color/urgency_color.py 2012-02-19 22:51:19 +0000
4@@ -64,7 +64,8 @@
5
6 if daysleft == None \
7 and ddate.__class__.__name__ != 'RealDate':
8- daysleft = (ddate.offset - date.today()).days
9+ #daysleft = (ddate.offset - date.today()).days
10+ daysleft = (ddate.days_left() - date.today()).days
11 color = 0
12 if daysleft <= dayspan:
13 color = 1

Subscribers

People subscribed via source and target branches

to all changes: