bzr-builder

Merge lp://staging/~cjwatson/bzr-builder/fix-comment-skipping into lp://staging/~james-w/bzr-builder/trunk-old

Proposed by Colin Watson on 2009-08-06

Status:	Merged
Merged at revision:	not available
Proposed branch:	lp://staging/~cjwatson/bzr-builder/fix-comment-skipping
Merge into:	lp://staging/~james-w/bzr-builder/trunk-old
Diff against target:	None lines
To merge this branch:	bzr merge lp://staging/~cjwatson/bzr-builder/fix-comment-skipping
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Westby		2009-08-06	Approve on 2009-08-17
Review via email: mp+9770@code.staging.launchpad.net

Revision history for this message

James Westby (james-w) wrote on 2009-08-17:

Merged with a testcase.

Thanks,

James

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'recipe.py'
2	--- recipe.py 2009-05-07 20:28:17 +0000
3	+++ recipe.py 2009-08-06 15:50:09 +0000
4	@@ -769,5 +769,5 @@
5	if self.peek_char() != "#":
6	return None
7	comment = self.current_line[self.index:]
8	- self.new_line()
9	+ self.index += len(comment)
10	return comment