This change looks good. I just have a comment on the test.
merge-conditional
-Edwin
>=== modified file 'lib/lp/code/stories/branches/xx-junk-branches.txt'
>--- lib/lp/code/stories/branches/xx-junk-branches.txt 2009-07-24 02:25:27 +0000
>+++ lib/lp/code/stories/branches/xx-junk-branches.txt 2010-01-20 00:48:20 +0000
>@@ -30,7 +31,14 @@
> Nearby
> Other branches owned by Eric
>
>-== Team Junk Branches ==
>+Junk branches do not support merge proposals, so the "Branch Merges" section of
>+the page should not be shown.
>+
>+ >>> assert find_tag_by_id(browser.contents, 'branch-merges') is None
If this fails, we would like to know what it found, so doctests should
match the return value like this:
>>> print find_tag_by_id(browser.contents, 'branch-merges')
None
>+
>+
>+Team Junk Branches
>+==================
>
> Junk branches can also be associated with a team.
>
Hi Paul,
This change looks good. I just have a comment on the test.
merge-conditional
-Edwin
>=== modified file 'lib/lp/ code/stories/ branches/ xx-junk- branches. txt' code/stories/ branches/ xx-junk- branches. txt 2009-07-24 02:25:27 +0000 code/stories/ branches/ xx-junk- branches. txt 2010-01-20 00:48:20 +0000 by_id(browser. contents, 'branch-merges') is None
>--- lib/lp/
>+++ lib/lp/
>@@ -30,7 +31,14 @@
> Nearby
> Other branches owned by Eric
>
>-== Team Junk Branches ==
>+Junk branches do not support merge proposals, so the "Branch Merges" section of
>+the page should not be shown.
>+
>+ >>> assert find_tag_
If this fails, we would like to know what it found, so doctests should by_id(browser. contents, 'branch-merges')
match the return value like this:
>>> print find_tag_
None
>+ ======= ======
>+
>+Team Junk Branches
>+=====
>
> Junk branches can also be associated with a team.
>