Re: [Monotone-devel] Tailor

[Brian May]

>>>>> "rghetta" == rghetta  <address@hidden> writes:

    rghetta> Sorry, I've lost you. The source scm says: rename
    rghetta> statistics to statistics/squid. Do you mean it should be
    rghetta> interpreted as rename stats to temp, create dir stats,
    rghetta> rename temp to stats/squid ?  Tailor sure doesn't do
    rghetta> anything like that. Given the differences in rename
    rghetta> support among scms, I doubt Tailor could do this sort of
    rghetta> inference in a scm-independent way.  Perhaps the monotone
    rghetta> backend could be enhanced to work this way, however.

No temp file is required, as the baz update operation has already
replaced the file with a directory as required. All that I needed was
to type in "mtn rm statistics" followed by "mtn add statistics".

The biggest problem I had with entering the commands manually is that
"mtn add statistics" automatically added all files under the directory
too. So I had to remove files that were automatically added. The I did
the renames (just a test so far - I didn't try to match the original
changeset exactly).

Now I get:

address@hidden:~/monotone/junk$ mtn status
Current branch: au.com.microcomaustralia.brian.junk
Changes against parent 25b6bc45748c83483cb071cf1d270d89a0ea8cb4:
  dropped statistics
  renamed .arch-ids/apache.id
       to statistics/.arch-ids/apache.id
  renamed .arch-ids/check_disks.id
       to reliability/.arch-ids/check_disks.id
  renamed .arch-ids/checkisdn.id
       to reliability/.arch-ids/checkisdn.id
  renamed .arch-ids/count_spam.id
       to statistics/.arch-ids/count_spam.id
  renamed .arch-ids/dotqmail.id
       to qmail2postfix/.arch-ids/dotqmail.id
  renamed .arch-ids/downloadmail.gluck.id
       to bsmtp/.arch-ids/downloadmail.gluck.id
  renamed .arch-ids/getmail.id
       to bsmtp/.arch-ids/getmail.id
  renamed .arch-ids/pbuilder-local.id
       to debian/.arch-ids/pbuilder-local.id
  renamed .arch-ids/processmail.id
       to statistics/.arch-ids/processmail.id
  renamed .arch-ids/sattest.id
       to reliability/.arch-ids/sattest.id
  renamed .arch-ids/sattest.start.id
       to reliability/.arch-ids/sattest.start.id
  renamed .arch-ids/statistics.id
       to statistics/.arch-ids/squid.id
  renamed .arch-ids/sync-channels-myth.conf.id
       to mythtv/.arch-ids/sync-channels-myth.conf.id
  renamed .arch-ids/sync-channels-myth.id
       to mythtv/.arch-ids/sync-channels-myth.id
  renamed .arch-ids/topostfix.id
       to qmail2postfix/.arch-ids/topostfix.id
  renamed .arch-ids/webalizer.id
       to statistics/.arch-ids/webalizer.id
  renamed .arch-ids/woody_get_build_upload.id
       to debian/.arch-ids/woody_get_build_upload.id
  renamed apache
       to statistics/apache
  renamed check_disks
       to reliability/check_disks
  renamed checkisdn
       to reliability/checkisdn
  renamed count_spam
       to statistics/count_spam
  renamed dotqmail
       to qmail2postfix/dotqmail
  renamed downloadmail.gluck
       to bsmtp/downloadmail.gluck
  renamed getmail
       to bsmtp/getmail
  renamed pbuilder-local
       to debian/pbuilder-local
  renamed processmail
       to statistics/processmail
  renamed sattest
       to reliability/sattest
  renamed sattest.start
       to reliability/sattest.start
  renamed sync-channels-myth
       to mythtv/sync-channels-myth
  renamed sync-channels-myth.conf
       to mythtv/sync-channels-myth.conf
  renamed topostfix
       to qmail2postfix/topostfix
  renamed webalizer
       to statistics/webalizer
  renamed woody_get_build_upload
       to debian/woody_get_build_upload
  added   bsmtp
  added   bsmtp/.arch-ids
  added   debian
  added   debian/.arch-ids
  added   mythtv
  added   mythtv/.arch-ids
  added   qmail2postfix
  added   qmail2postfix/.arch-ids
  added   reliability
  added   reliability/.arch-ids
  added   statistics
  added   statistics/.arch-ids

which makes me nervous because the add doesn't come until after the
rename.

address@hidden:~/monotone/junk$ mtn commit 
mtn: beginning commit on branch 'au.com.microcomaustralia.brian.junk'
enter passphrase for key ID address@hidden: 
enter passphrase for key ID address@hidden: 
enter passphrase for key ID address@hidden: 
mtn: committed revision 6e5b134db477396fec15b01625368058fee153d4

seems to have worked so far, lets try reverting to the previous version...


address@hidden:~/monotone/junk$ mtn update --revision 
176f0879aa85be219a61b2c47303ef778faf09c5
mtn: selected update target 176f0879aa85be219a61b2c47303ef778faf09c5
mtn: renaming statistics/.arch-ids/apache.id to .arch-ids/apache.id
mtn: renaming reliability/.arch-ids/check_disks.id to .arch-ids/check_disks.id
mtn: renaming reliability/.arch-ids/checkisdn.id to .arch-ids/checkisdn.id
mtn: renaming statistics/.arch-ids/count_spam.id to .arch-ids/count_spam.id
mtn: renaming statistics/.arch-ids/processmail.id to .arch-ids/processmail.id
mtn: renaming statistics/.arch-ids/squid.id to .arch-ids/statistics.id
mtn: renaming statistics/.arch-ids/webalizer.id to .arch-ids/webalizer.id
mtn: renaming statistics/apache to apache
mtn: renaming reliability/check_disks to check_disks
mtn: renaming reliability/checkisdn to checkisdn
mtn: renaming statistics/count_spam to count_spam
mtn: renaming statistics/processmail to processmail
mtn: adding statistics
mtn: renaming statistics/webalizer to webalizer
mtn: dropping update_vacation
mtn: dropping tla/make_signed
mtn: dropping tla/diff_changeset
mtn: dropping tla/.arch-ids/make_signed.id
mtn: dropping tla/.arch-ids/diff_changeset.id
mtn: dropping statistics/.arch-ids
mtn: error: could not remove '_MTN/tmp/16'
mtn: error: Directory not empty

oh yuck. It looks like mtn just allowed me to commit a changeset that
it can't handle.

Some other comments:

* There is nothing corrupt in the original baz repository, baz has no
problems coping with it.

* monotone probably shouldn't allow me to commit a changeset that it
can't cope with.

* Would splitting the above change into two separate changesets have helped? 
Short answer: No! (actually I expected this)

Long answer:

address@hidden:~/monotone/junk$ mv statistics/ statistics.tmp
mtn: adding statistics.tmp to workspace manifest
mtn: adding statistics.tmp/apache to workspace manifest
mtn: adding statistics.tmp/processmail to workspace manifest
mtn: adding statistics.tmp/squid to workspace manifest
mtn: adding statistics.tmp/webalizer to workspace manifest
mtn: adding statistics.tmp/count_spam to workspace manifest
mtn: adding statistics.tmp/.arch-ids to workspace manifest
mtn: adding statistics.tmp/.arch-ids/apache.id to workspace manifest
mtn: adding statistics.tmp/.arch-ids/processmail.id to workspace manifest
mtn: adding statistics.tmp/.arch-ids/squid.id to workspace manifest
mtn: adding statistics.tmp/.arch-ids/webalizer.id to workspace manifest
mtn: adding statistics.tmp/.arch-ids/count_spam.id to workspace manifest
mtn: adding statistics.tmp/.arch-ids/=id to workspace manifest
address@hidden:~/monotone/junk$ mtn rm statistics.tmp/* 
mtn: dropping statistics.tmp/webalizer from workspace manifest
mtn: dropping statistics.tmp/squid from workspace manifest
mtn: dropping statistics.tmp/processmail from workspace manifest
mtn: dropping statistics.tmp/count_spam from workspace manifest
mtn: dropping statistics.tmp/apache from workspace manifest
address@hidden:~/monotone/junk$ mtn rm statistics.tmp/.arch-ids/*
mtn: dropping statistics.tmp/.arch-ids/webalizer.id from workspace manifest
mtn: dropping statistics.tmp/.arch-ids/squid.id from workspace manifest
mtn: dropping statistics.tmp/.arch-ids/processmail.id from workspace manifest
mtn: dropping statistics.tmp/.arch-ids/count_spam.id from workspace manifest
mtn: dropping statistics.tmp/.arch-ids/apache.id from workspace manifest
mtn: dropping statistics.tmp/.arch-ids/=id from workspace manifest

address@hidden:~/monotone/junk$ mtn mv statistics statistics.tmp/squid 
mtn: skipping statistics.tmp, already accounted for in workspace
mtn: renaming statistics to statistics.tmp/squid in workspace manifest

address@hidden:~/monotone/junk$ mtn mv webalizer statistics.tmp/webalizer
mtn: skipping statistics.tmp, already accounted for in workspace
mtn: renaming webalizer to statistics.tmp/webalizer in workspace manifest

address@hidden:~/monotone/junk$ mtn mv count_spam statistics.tmp/count_spam
mtn: skipping statistics.tmp, already accounted for in workspace
mtn: renaming count_spam to statistics.tmp/count_spam in workspace manifest

address@hidden:~/monotone/junk$ mtn mv apache statistics.tmp/apache
mtn: skipping statistics.tmp, already accounted for in workspace
mtn: renaming apache to statistics.tmp/apache in workspace manifest

address@hidden:~/monotone/junk$ mtn mv processmail statistics.tmp/processmail 
mtn: skipping statistics.tmp, already accounted for in workspace
mtn: renaming processmail to statistics.tmp/processmail in workspace manifest

address@hidden:~/monotone/junk$ mtn mv .arch-ids/count_spam.id 
statistics.tmp/.arch-ids/count_spam.id 
mtn: skipping statistics.tmp/.arch-ids, already accounted for in workspace
mtn: renaming .arch-ids/count_spam.id to statistics.tmp/.arch-ids/count_spam.id 
in workspace manifest

address@hidden:~/monotone/junk$ mtn status
Current branch: au.com.microcomaustralia.brian.junk
Changes against parent a1b8dd08b014e886ae34281c966265f15a641b5b:
  renamed .arch-ids/apache.id
       to statistics.tmp/.arch-ids/apache.id
  renamed .arch-ids/check_disks.id
       to reliability/.arch-ids/check_disks.id
  renamed .arch-ids/checkisdn.id
       to reliability/.arch-ids/checkisdn.id
  renamed .arch-ids/count_spam.id
       to statistics.tmp/.arch-ids/count_spam.id
  renamed .arch-ids/dotqmail.id
       to qmail2postfix/.arch-ids/dotqmail.id
  renamed .arch-ids/downloadmail.gluck.id
       to bsmtp/.arch-ids/downloadmail.gluck.id
  renamed .arch-ids/getmail.id
       to bsmtp/.arch-ids/getmail.id
  renamed .arch-ids/pbuilder-local.id
       to debian/.arch-ids/pbuilder-local.id
  renamed .arch-ids/processmail.id
       to statistics.tmp/.arch-ids/processmail.id
  renamed .arch-ids/sattest.id
       to reliability/.arch-ids/sattest.id
  renamed .arch-ids/sattest.start.id
       to reliability/.arch-ids/sattest.start.id
  renamed .arch-ids/statistics.id
       to statistics.tmp/.arch-ids/squid.id
  renamed .arch-ids/sync-channels-myth.conf.id
       to mythtv/.arch-ids/sync-channels-myth.conf.id
  renamed .arch-ids/sync-channels-myth.id
       to mythtv/.arch-ids/sync-channels-myth.id
  renamed .arch-ids/topostfix.id
       to qmail2postfix/.arch-ids/topostfix.id
  renamed .arch-ids/webalizer.id
       to statistics.tmp/.arch-ids/webalizer.id
  renamed .arch-ids/woody_get_build_upload.id
       to debian/.arch-ids/woody_get_build_upload.id
  renamed apache
       to statistics.tmp/apache
  renamed check_disks
       to reliability/check_disks
  renamed checkisdn
       to reliability/checkisdn
  renamed count_spam
       to statistics.tmp/count_spam
  renamed dotqmail
       to qmail2postfix/dotqmail
  renamed downloadmail.gluck
       to bsmtp/downloadmail.gluck
  renamed getmail
       to bsmtp/getmail
  renamed pbuilder-local
       to debian/pbuilder-local
  renamed processmail
       to statistics.tmp/processmail
  renamed sattest
       to reliability/sattest
  renamed sattest.start
       to reliability/sattest.start
  renamed statistics
       to statistics.tmp/squid
  renamed sync-channels-myth
       to mythtv/sync-channels-myth
  renamed sync-channels-myth.conf
       to mythtv/sync-channels-myth.conf
  renamed topostfix
       to qmail2postfix/topostfix
  renamed webalizer
       to statistics.tmp/webalizer
  renamed woody_get_build_upload
       to debian/woody_get_build_upload
  added   bsmtp
  added   bsmtp/.arch-ids
  added   debian
  added   debian/.arch-ids
  added   mythtv
  added   mythtv/.arch-ids
  added   qmail2postfix
  added   qmail2postfix/.arch-ids
  added   reliability
  added   reliability/.arch-ids
  added   statistics.tmp
  added   statistics.tmp/.arch-ids
address@hidden:~/monotone/junk$ mtn commit 
mtn: beginning commit on branch 'au.com.microcomaustralia.brian.junk'
enter passphrase for key ID address@hidden: 
mtn: committed revision cfa683506517dfbd17959a4c1ebd899c840b4ad3
address@hidden:~/monotone/junk$ mtn mv statistics.tmp/ statistics/
mtn: renaming statistics.tmp to statistics in workspace manifest

address@hidden:~/monotone/junk$ mv statistics.tmp statistics
address@hidden:~/monotone/junk$ mtn status
Current branch: au.com.microcomaustralia.brian.junk
Changes against parent cfa683506517dfbd17959a4c1ebd899c840b4ad3:
  renamed statistics.tmp
       to statistics


address@hidden:~/monotone/junk$ mtn update --revision 
a1b8dd08b014e886ae34281c966265f15a641b5b
mtn: selected update target a1b8dd08b014e886ae34281c966265f15a641b5b
mtn: renaming statistics/.arch-ids/apache.id to .arch-ids/apache.id
mtn: renaming reliability/.arch-ids/check_disks.id to .arch-ids/check_disks.id
mtn: renaming reliability/.arch-ids/checkisdn.id to .arch-ids/checkisdn.id
mtn: renaming statistics/.arch-ids/count_spam.id to .arch-ids/count_spam.id
mtn: renaming qmail2postfix/.arch-ids/dotqmail.id to .arch-ids/dotqmail.id
mtn: renaming bsmtp/.arch-ids/downloadmail.gluck.id to 
.arch-ids/downloadmail.gluck.id
mtn: renaming bsmtp/.arch-ids/getmail.id to .arch-ids/getmail.id
mtn: renaming debian/.arch-ids/pbuilder-local.id to .arch-ids/pbuilder-local.id
mtn: renaming statistics/.arch-ids/processmail.id to .arch-ids/processmail.id
mtn: renaming reliability/.arch-ids/sattest.id to .arch-ids/sattest.id
mtn: renaming reliability/.arch-ids/sattest.start.id to 
.arch-ids/sattest.start.id
mtn: renaming statistics/.arch-ids/squid.id to .arch-ids/statistics.id
mtn: renaming mythtv/.arch-ids/sync-channels-myth.conf.id to 
.arch-ids/sync-channels-myth.conf.id
mtn: renaming mythtv/.arch-ids/sync-channels-myth.id to 
.arch-ids/sync-channels-myth.id
mtn: renaming qmail2postfix/.arch-ids/topostfix.id to .arch-ids/topostfix.id
mtn: renaming statistics/.arch-ids/webalizer.id to .arch-ids/webalizer.id
mtn: renaming debian/.arch-ids/woody_get_build_upload.id to 
.arch-ids/woody_get_build_upload.id
mtn: renaming statistics/apache to apache
mtn: renaming reliability/check_disks to check_disks
mtn: renaming reliability/checkisdn to checkisdn
mtn: renaming statistics/count_spam to count_spam
mtn: renaming qmail2postfix/dotqmail to dotqmail
mtn: renaming bsmtp/downloadmail.gluck to downloadmail.gluck
mtn: renaming bsmtp/getmail to getmail
mtn: renaming debian/pbuilder-local to pbuilder-local
mtn: renaming statistics/processmail to processmail
mtn: renaming reliability/sattest to sattest
mtn: renaming reliability/sattest.start to sattest.start
mtn: renaming statistics/squid to statistics
mtn: renaming mythtv/sync-channels-myth to sync-channels-myth
mtn: renaming mythtv/sync-channels-myth.conf to sync-channels-myth.conf
mtn: renaming qmail2postfix/topostfix to topostfix
mtn: renaming statistics/webalizer to webalizer
mtn: renaming debian/woody_get_build_upload to woody_get_build_upload
mtn: dropping statistics/.arch-ids
mtn: error: could not remove '_MTN/tmp/11'
mtn: error: Directory not empty


-- 
Brian May <address@hidden>