This is the diff-diff, comparing the branch from the first proposal and this branch before the above changes were made. It shows that the changes are identical and that the additional symlink does not appear here. 0a1,2 > === added symlink 'lib/canonical/launchpad/icing/yui' > === target is u'../../../../lazr-js/build/yui' 2,3c4,5 < --- lib/canonical/launchpad/security.py 2009-11-15 01:05:49 +0000 < +++ lib/canonical/launchpad/security.py 2009-11-17 09:51:03 +0000 --- > --- lib/canonical/launchpad/security.py 2009-11-13 05:13:07 +0000 > +++ lib/canonical/launchpad/security.py 2009-11-13 18:41:14 +0000 46c48 < @@ -1278,10 +1275,8 @@ --- > @@ -1310,10 +1307,8 @@ 59c61 < @@ -1291,11 +1286,12 @@ --- > @@ -1323,11 +1318,12 @@ 77c79 < +++ lib/lp/translations/browser/hastranslationimports.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/browser/hastranslationimports.py 2009-11-13 18:41:14 +0000 103c105 < +++ lib/lp/translations/browser/translationimportqueue.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/browser/translationimportqueue.py 2009-11-13 18:41:14 +0000 116c118 < +++ lib/lp/translations/doc/poexport-language-pack.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/poexport-language-pack.txt 2009-11-13 18:41:14 +0000 146c148 < +++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt 2009-11-13 18:41:14 +0000 185c187 < +++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt 2009-11-13 18:41:14 +0000 234c236 < +++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt 2009-11-13 18:41:14 +0000 319c321 < +++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt 2009-11-13 18:41:14 +0000 358c360 < +++ lib/lp/translations/doc/poimport.txt 2009-11-17 09:51:03 +0000 --- > +++ lib/lp/translations/doc/poimport.txt 2009-11-13 18:41:14 +0000 494c496 < +++ lib/lp/translations/doc/rosetta-karma.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/rosetta-karma.txt 2009-11-13 18:41:14 +0000 552c554 < +++ lib/lp/translations/doc/rosetta-poimport-script.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/rosetta-poimport-script.txt 2009-11-13 18:41:14 +0000 583c585 < +++ lib/lp/translations/doc/translationimportqueue.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/doc/translationimportqueue.txt 2009-11-13 18:41:14 +0000 835c837 < +++ lib/lp/translations/interfaces/translationimportqueue.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/interfaces/translationimportqueue.py 2009-11-13 18:41:14 +0000 920c922 < +++ lib/lp/translations/model/pofile.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/model/pofile.py 2009-11-13 18:41:14 +0000 948c950 < +++ lib/lp/translations/model/potemplate.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/model/potemplate.py 2009-11-13 18:41:14 +0000 980c982 < +++ lib/lp/translations/model/translationbranchapprover.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/model/translationbranchapprover.py 2009-11-13 18:41:14 +0000 1001c1003 < +++ lib/lp/translations/model/translationimportqueue.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/model/translationimportqueue.py 2009-11-13 18:41:14 +0000 1123c1125 < +++ lib/lp/translations/scripts/po_import.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/scripts/po_import.py 2009-11-13 18:41:14 +0000 1137c1139 < +++ lib/lp/translations/stories/webservice/xx-translationimportqueue.txt 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/stories/webservice/xx-translationimportqueue.txt 2009-11-13 18:41:14 +0000 1167c1169 < +++ lib/lp/translations/tests/test_autoapproval.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/tests/test_autoapproval.py 2009-11-13 18:41:14 +0000 1200c1202 < +++ lib/lp/translations/tests/test_translationbranchapprover.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/tests/test_translationbranchapprover.py 2009-11-13 18:41:14 +0000 1222c1224 < +++ lib/lp/translations/tests/test_translationimportqueue.py 2009-11-17 09:51:03 +0000 --- > +++ lib/lp/translations/tests/test_translationimportqueue.py 2009-11-13 18:41:14 +0000 1352c1354 < +++ lib/lp/translations/utilities/permission_helpers.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/utilities/permission_helpers.py 2009-11-13 18:41:14 +0000 1378c1380 < +++ lib/lp/translations/utilities/tests/helpers.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/utilities/tests/helpers.py 2009-11-13 18:41:14 +0000 1400c1402 < +++ lib/lp/translations/utilities/tests/test_xpi_import.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/utilities/tests/test_xpi_import.py 2009-11-13 18:41:14 +0000 1422c1424 < +++ lib/lp/translations/utilities/tests/test_xpi_po_exporter.py 2009-11-17 09:49:17 +0000 --- > +++ lib/lp/translations/utilities/tests/test_xpi_po_exporter.py 2009-11-13 18:41:14 +0000