Merge lp:~dholbach/ubuntu-packaging-guide/mightmightmight into lp:ubuntu-packaging-guide

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 87
Proposed branch: lp:~dholbach/ubuntu-packaging-guide/mightmightmight
Merge into: lp:ubuntu-packaging-guide
Diff against target: 15 lines (+3/-3)
1 file modified
ubuntu-packaging-guide/introduction-to-ubuntu-development.rst (+3/-3)
To merge this branch: bzr merge lp:~dholbach/ubuntu-packaging-guide/mightmightmight
Reviewer Review Type Date Requested Status
Andrew Starr-Bochicchio Approve
Review via email: mp+104695@code.launchpad.net

Description of the change

Here's the wdiff:

Open Source Development happens in a distributed world with different goals
and different areas of focus. For example there might be the case that a
particular Upstream [-might be-] {+is+} interested in working on a new big feature while
Ubuntu, because of the tight release schedule, [-might be-] {+is+} interested in shipping a
solid version with just an additional bug fix. That is why we make use of
"Distributed Development", where code is being worked on in various branches
that are merged with each other after code reviews and sufficient discussion.

To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu-packaging-guide/introduction-to-ubuntu-development.rst'
--- ubuntu-packaging-guide/introduction-to-ubuntu-development.rst 2012-02-29 10:05:20 +0000
+++ ubuntu-packaging-guide/introduction-to-ubuntu-development.rst 2012-05-04 07:53:19 +0000
@@ -87,9 +87,9 @@
8787
88Open Source Development happens in a distributed world with different goals88Open Source Development happens in a distributed world with different goals
89and different areas of focus. For example there might be the case that a 89and different areas of focus. For example there might be the case that a
90particular Upstream might be interested in working on a new big feature while90particular Upstream is interested in working on a new big feature while
91Ubuntu, because of the tight release schedule, might be interested in shipping 91Ubuntu, because of the tight release schedule, is interested in shipping a
92a solid version with just an additional bug fix. That is why we make use of 92solid version with just an additional bug fix. That is why we make use of
93"Distributed Development", where code is being worked on in various branches93"Distributed Development", where code is being worked on in various branches
94that are merged with each other after code reviews and sufficient discussion.94that are merged with each other after code reviews and sufficient discussion.
9595

Subscribers

People subscribed via source and target branches