Phil et al, On Wed, Aug 27, 2008 at 4:44 AM, Philipp Marek <[EMAIL PROTECTED]> wrote: > > Hello Stuart! > > On Tuesday 26 August 2008 Stuart Lester wrote: > > In our testing environment, we'll make some changes and then commit them > > fine, but when we try to do an update, we will often (but not always) get > > something like the following: > > > > dev-01 / # fsvs update -r 19 > > Updating svn+ssh://[EMAIL PROTECTED]//home/user/svn/osrepo to revision > > 19. > > The entry ./etc/fsvs has changed locally > I cannot reproduce that for a directory. > And /etc/fsvs shouldn't have changed - possibly the files two levels below.
I must admit, I did not see that _exact_ error when I pasted earlier. I do know that I saw it previously, and I figured that directory would useful to post than the actual one that I posted. Here is my latest error (with only the username/hostname changed): dev-01 / # fsvs update -r 19 Updating svn+ssh://[EMAIL PROTECTED]//home/hydra/svn/obx to revision 19. The entry ./opt/hydra-client/hydra_client/task_scripts has changed locally The entry in question is in fact a directory. I'm fairly certian that I have not changed it...this was a clean install followed by a series of "fsvs update" commands. > > We've tried with and without the "-r <revision>", and we don't always get > > the same file as having changed (though it is usually one of a handful of > > files). > Is that really a file? /etc/fsvs is normally a directory. Definitely a directory. > I'd expect you'll likely have a problem that you put /etc/fsvs in the > repository, although *both* the master server and the clients use it. > The master server updates the file on every commit, and the clients want to > change it on every update - and therefore each sees it as changed. We've now corrected this...having /etc/fsvs in the repository has always been a nagging concern of mine, but I didn't know how to otherwise reflect updates to the Ign file. I have a solution for that now, so no worries. > If it's only something in /etc/fsvs, you could simply ignore that hierarchy - > see "fsvs ignore" and "fsvs unversion" for that. > > Otherwise, do you possibly commit log files that change on the clients as > well? We have ignored all log files, and that doesn't seem to be the problem. > If that doesn't solve your problem - could you do a "fsvs log -r19 -v" to see > which entries have changed in that revision, and a "fsvs st" on the client > before running "update"? dev-01 / # fsvs log -r19 -v ------------------------------------------------------------------------ r19 | hydra | 2008-08-20T20:57:14.013041Z | 1 line Changed paths: /opt/hydra-client/hydra_client/task_scripts /opt/vmware/server/lib/libconf/etc/pango/pangorc /opt/vmware/server/lib/serverd/init.pl /opt/hydra-client/templates/boot/grub/grub.conf /opt/vmware/server/lib/libconf/etc/pango /opt/vmware/server/lib/libconf/etc/gtk-2.0/gtk.immodules /opt/jungledisk/etc /opt/vmware/server/lib/libconf/etc/gtk-2.0/gdk-pixbuf.loaders /opt/hydra-client/hydra_client/task_scripts/sync_build.py /opt/hydra-client/templates/boot/grub /opt/vmware/server/lib/libconf/etc/pango/pango.modules /opt/vmware/server/lib/libconf/etc/pango/pangox.aliases /opt/vmware/server/lib/libconf/etc/gtk-2.0 /opt/vmware/server/lib/serverd /opt/hydra-client/templates/etc/fstab /opt/hydra-client/templates/etc Updates for fsvs and a fix for hda (non-RAID) ------------------------------------------------------------------------ dev-01 / # fsvs st .mC. 714 etc/mtab d... dir etc/fsvs .mC. 3029 etc/fsvs/6666cd76f96956469e7be39d750cc7d9/Ign .m.. dir etc/fsvs/6666cd76f96956469e7be39d750cc7d9 .mC. 779 opt/hydra-client/hydra_client/task_scripts/sync_build.py .m.? 589 etc/prelink.conf N... dir .python-eggs N... 79663 .python-eggs/pysqlite-2.4.1-py2.5-linux-i686.egg-tmp/pysqlite2/_sqlite.so N... dir .python-eggs/pysqlite-2.4.1-py2.5-linux-i686.egg-tmp/pysqlite2 N... dir .python-eggs/pysqlite-2.4.1-py2.5-linux-i686.egg-tmp N... 16528 .python-eggs/simplejson-1.9.2-py2.5-linux-i686.egg-tmp/simplejson/_speedups.so N... dir .python-eggs/simplejson-1.9.2-py2.5-linux-i686.egg-tmp/simplejson N... dir .python-eggs/simplejson-1.9.2-py2.5-linux-i686.egg-tmp ..C. dir . .m.. dir opt/hydra-client/hydra_client/task_scripts .m.? 2070 var/cache/edb/mtimedb .m.. dir var/spool/fsvs .m.. dir etc .m.. dir var/cache/edb The /opt/hydra-client/hydra_client/task_scripts directory does show as being "m", but I don't understand why that would mess up the update? Finally, fwiw, a while back, I submitted a gentoo ebuild (their equivalent of RPM) to that project (as Gentoo is our OS of choice). It's an old version (1.1.9), but someone did update it to 1.1.16. Unfortunately, though, it hasn't yet been accepted into their official tree. Anyhow, just trying to give a little back. Thanks again for the help, Stu --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
