baz-import-branch: unexpected conflicts
Ben Finney
bignose+hates-spam at benfinney.id.au
Thu Aug 24 00:49:32 BST 2006
Howdy all,
[Replies only to the discussion forum please, I subscribe via NNTP.]
I'm trying to convert a branch from baz to bzr, but it's failing with
the following output.
=====
$ bzr --version | head -n 1
bzr (bazaar-ng) 0.8.2
$ baz --version | head -n 1
baz Bazaar version 1.4.2 (thelove at canonical.com/dists--bazaar--1.4[bazaar--devo.cfg])
$ aptitude show pybaz | grep Version:
Version: 1.5pre1-2
$ bzr baz-import-branch www.benfinney.id.au/ ben at benfinney.id.au--bignose-2005/websites--mainline--0
importing ben at benfinney.id.au--bignose-2005/websites--mainline--0 into /home/bignose/Projects/websites/www.benfinney.id.au
Cleaning up
bzr: ERROR: pybaz.errors.ExecProblem: baz exited with code 2 (expected exit code 0)
argv: 'get', 'ben at benfinney.id.au--bignose-2005/websites--mainline--0--base-0', '/home/bignose/Projects/websites/baz2bzr--86oZQ/rd'
* error report
* Scanning for full-tree revision: ....
* from revision library (linking): ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-2
* Applying 2 revisions (in reverse): ..****************************************************
5 conflicted items in this tree. Please
resolve each conflict with baz "resolved 'filename'"
****************************************************
baz: uncaught exception: -1:(conflict applying patch in arch_build_revision)
please report this as a bug to bazaar at lists.canonical.com
at /usr/lib/python2.4/site-packages/pybaz/backends/forkexec.py line 361
in wait
=====
At abentley's suggestion, I used 'baz replay' to attempt to isolate
the problem. The resulting script is below. (File and directory names
have been changed in this message since this relates to a website that
I'd rather not have publicly disclosed.)
Note that the above 'baz-import-branch' output doesn't seem concerned
with any revision past patch-2.
=====
Script started on Wed 23 Aug 2006 13:42:13 EST
$ baz get ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
* ensuring library has ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
* Scanning for full-tree revision: ....
* from revision library (linking): ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-2
* Applying 1 revisions (in reverse): .
* Scanning for full-tree revision: ..
* from revision library: ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
* tree version set ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-1
$ cd websites--mainline--0--patch-1/
$ baz replay
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-2
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-2
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-3
D www.benfinney.id.au/htdocs/error/.arch-ids/401unauthorized.php.id
D www.benfinney.id.au/htdocs/error/.arch-ids/403forbidden.php.id
D www.benfinney.id.au/htdocs/error/.arch-ids/404notfound.php.id
D www.benfinney.id.au/htdocs/error/401unauthorized.php
D www.benfinney.id.au/htdocs/error/403forbidden.php
D www.benfinney.id.au/htdocs/error/404notfound.php
D/ example/bignose.example.org/htdocs/pineal/edit/.arch-ids
D/ example/bignose.example.org/htdocs/pineal/comment/.arch-ids
D/ example/bignose.example.org/htdocs/pineal/admin/.arch-ids
D/ example/bignose.example.org/htdocs/pineal/addnews/.arch-ids
A/ example/bignose.example.org/htdocs/pineal
/> example/bignose.example.org/htdocs/pineal example/bignose.example.org/htdocs/pineal.OLD-bplog
A/ example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids
A/ example/bignose.example.org/htdocs/pineal.OLD-bplog/addnews/.arch-ids
A/ example/bignose.example.org/htdocs/pineal.OLD-bplog/admin/.arch-ids
A/ example/bignose.example.org/htdocs/pineal.OLD-bplog/comment/.arch-ids
A/ example/bignose.example.org/htdocs/pineal.OLD-bplog/edit/.arch-ids
/> example/bignose.example.org/htdocs/pineal/.arch-ids example/bignose.example.org/htdocs/pineal/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/archives
A/ example/bignose.example.org/htdocs/pineal/archives/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/articles
A/ example/bignose.example.org/htdocs/pineal/articles/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/cache
A/ example/bignose.example.org/htdocs/pineal/cache/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/data
A/ example/bignose.example.org/htdocs/pineal/data/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/images
A/ example/bignose.example.org/htdocs/pineal/images/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/parts
A/ example/bignose.example.org/htdocs/pineal/parts/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/styles
A/ example/bignose.example.org/htdocs/pineal/styles/.arch-ids
A/ example/bignose.example.org/htdocs/pineal/templates
A/ example/bignose.example.org/htdocs/pineal/templates/.arch-ids
A/ example/bignose.example.org/htdocs/projects/librarian
A/ example/bignose.example.org/htdocs/projects/librarian/.arch-ids
A/ example/bignose.example.org/htdocs/projects/recordjar
A/ example/bignose.example.org/htdocs/projects/recordjar/.arch-ids
A/ www.benfinney.id.au/htdocs/error/401
A/ www.benfinney.id.au/htdocs/error/401/.arch-ids
A/ www.benfinney.id.au/htdocs/error/403
A/ www.benfinney.id.au/htdocs/error/403/.arch-ids
A/ www.benfinney.id.au/htdocs/error/404
A/ www.benfinney.id.au/htdocs/error/404/.arch-ids
A/ www.benfinney.id.au/htdocs/error/500
A/ www.benfinney.id.au/htdocs/error/500/.arch-ids
=> example/bignose.example.org/htdocs/pineal/.arch-ids/=id example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids/=id
=> example/bignose.example.org/htdocs/pineal/addnews/.arch-ids/=id example/bignose.example.org/htdocs/pineal.OLD-bplog/addnews/.arch-ids/=id
=> example/bignose.example.org/htdocs/pineal/admin/.arch-ids/=id example/bignose.example.org/htdocs/pineal.OLD-bplog/admin/.arch-ids/=id
=> example/bignose.example.org/htdocs/pineal/comment/.arch-ids/=id example/bignose.example.org/htdocs/pineal.OLD-bplog/comment/.arch-ids/=id
=> example/bignose.example.org/htdocs/pineal/edit/.arch-ids/=id example/bignose.example.org/htdocs/pineal.OLD-bplog/edit/.arch-ids/=id
=> example/bignose.example.org/htdocs/pineal/.arch-ids/.htaccess.id example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids/.htaccess.id
=> example/bignose.example.org/htdocs/pineal/addnews/.arch-ids/addnews.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/addnews/.arch-ids/addnews.php.id
=> example/bignose.example.org/htdocs/pineal/addnews/.arch-ids/index.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/addnews/.arch-ids/index.php.id
=> example/bignose.example.org/htdocs/pineal/admin/.arch-ids/.htaccess.id example/bignose.example.org/htdocs/pineal.OLD-bplog/admin/.arch-ids/.htaccess.id
=> example/bignose.example.org/htdocs/pineal/admin/.arch-ids/admin.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/admin/.arch-ids/admin.php.id
=> example/bignose.example.org/htdocs/pineal/admin/.arch-ids/index.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/admin/.arch-ids/index.php.id
=> example/bignose.example.org/htdocs/pineal/.arch-ids/bignose_pineal.mysql.sql.id example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids/bignose_pineal.mysql.sql.id
=> example/bignose.example.org/htdocs/pineal/.arch-ids/bignose_pineal.pgsql.sql.id example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids/bignose_pineal.pgsql.sql.id
=> example/bignose.example.org/htdocs/pineal/comment/.arch-ids/comment.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/comment/.arch-ids/comment.php.id
=> example/bignose.example.org/htdocs/pineal/comment/.arch-ids/index.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/comment/.arch-ids/index.php.id
=> example/bignose.example.org/htdocs/pineal/edit/.arch-ids/edit.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/edit/.arch-ids/edit.php.id
=> example/bignose.example.org/htdocs/pineal/edit/.arch-ids/index.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/edit/.arch-ids/index.php.id
=> example/bignose.example.org/htdocs/pineal/.arch-ids/index.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids/index.php.id
=> example/bignose.example.org/htdocs/pineal/.arch-ids/pineal.php.id example/bignose.example.org/htdocs/pineal.OLD-bplog/.arch-ids/pineal.php.id
A example/bignose.example.org/htdocs/images/.arch-ids/anybrowser_80x15.png.id
A example/bignose.example.org/htdocs/images/anybrowser_80x15.png
A example/bignose.example.org/htdocs/pineal/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/.arch-ids/atom.xml.id
A example/bignose.example.org/htdocs/pineal/.arch-ids/blog.conf.id
A example/bignose.example.org/htdocs/pineal/.arch-ids/index.html.id
A example/bignose.example.org/htdocs/pineal/.arch-ids/index.xml.id
A example/bignose.example.org/htdocs/pineal/.arch-ids/rss.xml.id
A example/bignose.example.org/htdocs/pineal/.arch-ids/sitesync.id
A example/bignose.example.org/htdocs/pineal/.arch-ids/whatispineal.txt.id
A example/bignose.example.org/htdocs/pineal/archives/.arch-ids/2004-11.html.id
A example/bignose.example.org/htdocs/pineal/archives/.arch-ids/2005-04.html.id
A example/bignose.example.org/htdocs/pineal/archives/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/archives/.arch-ids/cat_1.html.id
A example/bignose.example.org/htdocs/pineal/archives/.arch-ids/index.html.id
A example/bignose.example.org/htdocs/pineal/archives/2004-11.html
A example/bignose.example.org/htdocs/pineal/archives/2005-04.html
A example/bignose.example.org/htdocs/pineal/archives/cat_1.html
A example/bignose.example.org/htdocs/pineal/archives/index.html
A example/bignose.example.org/htdocs/pineal/articles/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/articles/.arch-ids/example.html.id
A example/bignose.example.org/htdocs/pineal/articles/.arch-ids/example.txt.id
A example/bignose.example.org/htdocs/pineal/articles/example.html
A example/bignose.example.org/htdocs/pineal/articles/example.txt
A example/bignose.example.org/htdocs/pineal/atom.xml
A example/bignose.example.org/htdocs/pineal/blog.conf
A example/bignose.example.org/htdocs/pineal/cache/.arch-ids/2004-11-07T18_52_16.txt.body.id
A example/bignose.example.org/htdocs/pineal/cache/.arch-ids/2005-04-15T13_57_09.txt.body.id
A example/bignose.example.org/htdocs/pineal/cache/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/cache/2004-11-07T18_52_16.txt.body
A example/bignose.example.org/htdocs/pineal/cache/2005-04-15T13_57_09.txt.body
A example/bignose.example.org/htdocs/pineal/data/.arch-ids/2004-11-07T18_52_16.txt.id
A example/bignose.example.org/htdocs/pineal/data/.arch-ids/2005-04-15T13_57_09.txt.id
A example/bignose.example.org/htdocs/pineal/data/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/data/.arch-ids/cat_1.db.id
A example/bignose.example.org/htdocs/pineal/data/2004-11-07T18_52_16.txt
A example/bignose.example.org/htdocs/pineal/data/2005-04-15T13_57_09.txt
A example/bignose.example.org/htdocs/pineal/data/cat_1.db
A example/bignose.example.org/htdocs/pineal/images/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/images/.arch-ids/favicon.ico.id
A example/bignose.example.org/htdocs/pineal/images/favicon.ico
A example/bignose.example.org/htdocs/pineal/index.html
A example/bignose.example.org/htdocs/pineal/index.xml
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/2004-11.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/2005-04.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/archive_links.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/article_links.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/blog_status.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/cal-2004-11.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/cal-2005-04.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/cal.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/cat_1.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/fortune.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/index.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/older_entries.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/recent_entries.html.id
A example/bignose.example.org/htdocs/pineal/parts/.arch-ids/tidy.html.id
A example/bignose.example.org/htdocs/pineal/parts/2004-11.html
A example/bignose.example.org/htdocs/pineal/parts/2005-04.html
A example/bignose.example.org/htdocs/pineal/parts/archive_links.html
A example/bignose.example.org/htdocs/pineal/parts/article_links.html
A example/bignose.example.org/htdocs/pineal/parts/blog_status.html
A example/bignose.example.org/htdocs/pineal/parts/cal-2004-11.html
A example/bignose.example.org/htdocs/pineal/parts/cal-2005-04.html
A example/bignose.example.org/htdocs/pineal/parts/cal.html
A example/bignose.example.org/htdocs/pineal/parts/cat_1.html
A example/bignose.example.org/htdocs/pineal/parts/fortune.html
A example/bignose.example.org/htdocs/pineal/parts/index.html
A example/bignose.example.org/htdocs/pineal/parts/older_entries.html
A example/bignose.example.org/htdocs/pineal/parts/recent_entries.html
A example/bignose.example.org/htdocs/pineal/parts/tidy.html
A example/bignose.example.org/htdocs/pineal/rss.xml
A example/bignose.example.org/htdocs/pineal/sitesync
A example/bignose.example.org/htdocs/pineal/styles/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/styles/.arch-ids/nb_clean.css.id
A example/bignose.example.org/htdocs/pineal/styles/.arch-ids/nb_default.css.id
A example/bignose.example.org/htdocs/pineal/styles/.arch-ids/nb_rusted.css.id
A example/bignose.example.org/htdocs/pineal/styles/.arch-ids/nb_spring.css.id
A example/bignose.example.org/htdocs/pineal/styles/.arch-ids/pineal.css.id
A example/bignose.example.org/htdocs/pineal/styles/nb_clean.css
A example/bignose.example.org/htdocs/pineal/styles/nb_default.css
A example/bignose.example.org/htdocs/pineal/styles/nb_rusted.css
A example/bignose.example.org/htdocs/pineal/styles/nb_spring.css
A example/bignose.example.org/htdocs/pineal/styles/pineal.css
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/=id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/blog_status.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/category_archive.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/entry.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/main_index.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/main_links.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/makepage.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/month_archive.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/permalink.htm.id
A example/bignose.example.org/htdocs/pineal/templates/.arch-ids/permalink_entry.htm.id
A example/bignose.example.org/htdocs/pineal/templates/blog_status.htm
A example/bignose.example.org/htdocs/pineal/templates/category_archive.htm
A example/bignose.example.org/htdocs/pineal/templates/entry.htm
A example/bignose.example.org/htdocs/pineal/templates/main_index.htm
A example/bignose.example.org/htdocs/pineal/templates/main_links.htm
A example/bignose.example.org/htdocs/pineal/templates/makepage.htm
A example/bignose.example.org/htdocs/pineal/templates/month_archive.htm
A example/bignose.example.org/htdocs/pineal/templates/permalink.htm
A example/bignose.example.org/htdocs/pineal/templates/permalink_entry.htm
A example/bignose.example.org/htdocs/pineal/whatispineal.txt
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/=id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/index.php.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/librarian.php.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/librarian.py.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/library-loans.example.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/library-patrons.example.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/loan_list.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/loan_nag.id
A example/bignose.example.org/htdocs/projects/librarian/.arch-ids/menu_nav_page.inc.id
A example/bignose.example.org/htdocs/projects/librarian/librarian.php
A example/bignose.example.org/htdocs/projects/librarian/librarian.py
A example/bignose.example.org/htdocs/projects/librarian/library-loans.example
A example/bignose.example.org/htdocs/projects/librarian/library-patrons.example
A example/bignose.example.org/htdocs/projects/librarian/menu_nav_page.inc
A example/bignose.example.org/htdocs/projects/recordjar/.arch-ids/=id
A example/bignose.example.org/htdocs/projects/recordjar/.arch-ids/index.php.id
A example/bignose.example.org/htdocs/projects/recordjar/.arch-ids/menu_nav_page.inc.id
A example/bignose.example.org/htdocs/projects/recordjar/.arch-ids/recordjar.php.id
A example/bignose.example.org/htdocs/projects/recordjar/.arch-ids/recordjar.py.id
A example/bignose.example.org/htdocs/projects/recordjar/recordjar.php
A example/bignose.example.org/htdocs/projects/recordjar/recordjar.py
A www.benfinney.id.au/htdocs/_templates/.arch-ids/error_internalerror.tpl.html.id
A www.benfinney.id.au/htdocs/_templates/error_internalerror.tpl.html
A www.benfinney.id.au/htdocs/error/401/.arch-ids/401unauthorized.php.id
A www.benfinney.id.au/htdocs/error/401/.arch-ids/=id
A www.benfinney.id.au/htdocs/error/401/.arch-ids/index.php.id
A www.benfinney.id.au/htdocs/error/401/401unauthorized.php
A www.benfinney.id.au/htdocs/error/403/.arch-ids/403forbidden.php.id
A www.benfinney.id.au/htdocs/error/403/.arch-ids/=id
A www.benfinney.id.au/htdocs/error/403/.arch-ids/index.php.id
A www.benfinney.id.au/htdocs/error/403/403forbidden.php
A www.benfinney.id.au/htdocs/error/404/.arch-ids/404notfound.php.id
A www.benfinney.id.au/htdocs/error/404/.arch-ids/=id
A www.benfinney.id.au/htdocs/error/404/.arch-ids/index.php.id
A www.benfinney.id.au/htdocs/error/404/404notfound.php
A www.benfinney.id.au/htdocs/error/500/.arch-ids/500internalservererror.php.id
A www.benfinney.id.au/htdocs/error/500/.arch-ids/=id
A www.benfinney.id.au/htdocs/error/500/.arch-ids/index.php.id
A www.benfinney.id.au/htdocs/error/500/500internalservererror.php
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-3
A example/bignose.example.org/htdocs/projects/librarian/index.php
A example/bignose.example.org/htdocs/projects/librarian/loan_list
A example/bignose.example.org/htdocs/projects/librarian/loan_nag
A example/bignose.example.org/htdocs/projects/recordjar/index.php
A example/bignose.example.org/htdocs/projects/recordjar/menu_nav_page.inc
A www.benfinney.id.au/htdocs/error/401/index.php
A www.benfinney.id.au/htdocs/error/403/index.php
A www.benfinney.id.au/htdocs/error/404/index.php
A www.benfinney.id.au/htdocs/error/500/index.php
M example/bignose.example.org/.rsync_exclude
M example/bignose.example.org/blosxom/config.py
M example/bignose.example.org/php-bin/footer_navlinks.inc
M example/toad.example.org/.rsync_exclude
M example/toad.example.org/sitesync-example
M example/example.org/.rsync_exclude
M example/example.org/sitesync-example
M www.benfinney.id.au/.rsync_exclude
M www.benfinney.id.au/htdocs/.htaccess
M www.benfinney.id.au/htdocs/_templates/benfinney_list.tpl.html
M www.benfinney.id.au/htdocs/_templates/configs/settings.conf
M www.benfinney.id.au/htdocs/_templates/html_header.tpl.html
M www.benfinney.id.au/htdocs/_templates/nospam.tpl.html
M www.benfinney.id.au/htdocs/contact/nospam/nospam.php
M www.benfinney.id.au/sitesync-example
M-> www.benfinney.id.au/htdocs/_templates/configs/host.conf
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-4
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-4
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-5
D example/.arch-ids/passwords.txt.id
D example/passwords.txt
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-5
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-6
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-6
M www.benfinney.id.au/htdocs/_templates/nospam.tpl.html
M www.benfinney.id.au/htdocs/contact/nospam/menu_nav_page.inc
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-7
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-7
M www.benfinney.id.au/htdocs/_templates/nospam.tpl.html
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-8
A/ example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0
A/ example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-ids
A/ example/bignose.example.org/htdocs/tmp
A/ example/bignose.example.org/htdocs/tmp/.arch-ids
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-ids/.arch-inventory.id
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-ids/=id
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-ids/ez_setup.py.id
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-ids/setup.py.id
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-ids/uuid.py.id
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/.arch-inventory
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/ez_setup.py
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/setup.py
A example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/uuid.py
A example/bignose.example.org/htdocs/tmp/.arch-ids/=id
A www.benfinney.id.au/htdocs/.arch-ids/home.smarty.php.id
A www.benfinney.id.au/htdocs/.arch-ids/test.php.id
A www.benfinney.id.au/htdocs/_phplib/.arch-ids/site.inc.id
A www.benfinney.id.au/htdocs/_phplib/site.inc
A www.benfinney.id.au/htdocs/_templates/.arch-ids/about.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/benfinney_list.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/default.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/home.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/html_default.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/nav_menus.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/sidebar.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/test.tal.html.id
A www.benfinney.id.au/htdocs/_templates/.arch-ids/w3c_standards.tal.html.id
A www.benfinney.id.au/htdocs/_templates/about.tal.html
A www.benfinney.id.au/htdocs/_templates/benfinney_list.tal.html
A www.benfinney.id.au/htdocs/_templates/default.tal.html
A www.benfinney.id.au/htdocs/_templates/home.tal.html
A www.benfinney.id.au/htdocs/_templates/html_default.tal.html
A www.benfinney.id.au/htdocs/_templates/nav_menus.tal.html
A www.benfinney.id.au/htdocs/_templates/sidebar.tal.html
A www.benfinney.id.au/htdocs/_templates/sideboxes/.arch-ids/menu_nav.tpl.html.tal.html.id
A www.benfinney.id.au/htdocs/_templates/sideboxes/menu_nav.tpl.html.tal.html
A www.benfinney.id.au/htdocs/_templates/test.tal.html
A www.benfinney.id.au/htdocs/_templates/w3c_standards.tal.html
A www.benfinney.id.au/htdocs/about/.arch-ids/about.smarty.php.id
A www.benfinney.id.au/htdocs/about/.arch-ids/about.tal.php.id
A www.benfinney.id.au/htdocs/about/about.smarty.php
A www.benfinney.id.au/htdocs/about/about.tal.php
A www.benfinney.id.au/htdocs/home.smarty.php
A www.benfinney.id.au/htdocs/test.php
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-8
M www.benfinney.id.au/htdocs/_phplib/menu_nav_site.inc
M www.benfinney.id.au/htdocs/_templates/css/colour-greys.tpl.css
M www.benfinney.id.au/htdocs/common.inc
M www.benfinney.id.au/htdocs/home.php
ch www.benfinney.id.au/htdocs/about/about.php
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-9
A www.benfinney.id.au/htdocs/.arch-ids/favicon.ico.id
A www.benfinney.id.au/htdocs/.arch-ids/robots.txt.id
A www.benfinney.id.au/htdocs/_phplib/.arch-ids/wdg_standards.inc.id
A www.benfinney.id.au/htdocs/_phplib/wdg_standards.inc
A www.benfinney.id.au/htdocs/favicon.ico
A www.benfinney.id.au/htdocs/robots.txt
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-9
M example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/setup.py
M example/bignose.example.org/htdocs/projects/lib-uuid--devel--1.7--base-0/uuid.py
M www.benfinney.id.au/htdocs/_templates/about.tal.html
* patching for revision ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-10
A {arch}/websites/websites--mainline/websites--mainline--0/ben at benfinney.id.au--bignose-2005/patch-log/patch-10
M www.benfinney.id.au/htdocs/_templates/css/text-normal.tpl.css
Script done on Wed 23 Aug 2006 13:45:17 EST
=====
This isn't a public archive, and I'd really prefer not to spread it
around. If I can perform more diagnostics to help, please let me know.
--
\ "I cannot conceive that anybody will require multiplications at |
`\ the rate of 40,000 or even 4,000 per hour ..." -- F. H. Wales |
_o__) (1936) |
Ben Finney
More information about the bazaar
mailing list