Code review comment for lp://staging/~intellectronica/launchpad/revert-production-devel-mess

On Wed, Mar 10, 2010 at 01:42:25PM -0000, Tom Berger wrote:

> === modified file '.bzrignore'
> --- .bzrignore 2010-03-09 02:42:40 +0000
> +++ .bzrignore 2010-03-10 13:42:24 +0000
> @@ -60,5 +60,9 @@
> .testrepository
> .memcache.pid
> ./pipes
> +<<<<<<< TREE
> lib/canonical/launchpad/apidoc/wadl-development-*.xml
> tags.new
> +=======
> +tags.new
> +>>>>>>> MERGE-SOURCE

This doesn't look right. However, it seems like you specified the wrong
merge target. I got the branch, and confirmed that the diff against
r9082 contains only the diff of r9085, so it looks good to be merged
into production-devel.

    vote approve

--
Björn Tillenius | https://launchpad.net/~bjornt