On Thu, Sep 18, 2008 at 07:41:23PM +0200, Philipp Marek wrote: > Do you get some error message, apart from the conflict? > > How about trying to use the conflict=merge, or even conflict=local option? > Then it should never stop in case of a conflict.
The thing is that I don't understand the cause of the conflict. The .fsvs directory is not listed when I do fsvs status, the update that follows is aborted because .fsvs has been modified locally and afterwards the fsvs status command still doesn't show .fsvs as having been modified. How is that possible? > But I think that the only case is a conflict - and that should be avoidable > by > setting the option, for ease of use maybe in /etc/fsvs/config. I'd rather not handle this conflict until I understand where it's coming from. > If you could reproduce any problems _apart_ from the conflict case, I'd be > *very* interested to hear. > Then I'd like to see a debug log, as a first hint. Another thing I'm seeing is that a commit changes the timestamp of the Urls file and the directories that this file is in. It looks like that results in those directories always having changes. [EMAIL PROTECTED] ~> ls -ald .fsvs/6666cd76f96956469e7be39d750cc7d9/Urls .fsvs/6666cd76f96956469e7be39d750cc7d9/ .fsvs/ drwx------ 4 griffon26 users 4096 2008-10-05 17:35 .fsvs/ drwx------ 2 griffon26 users 4096 2008-10-05 17:35 .fsvs/6666cd76f96956469e7be39d750cc7d9/ -rwx------ 1 griffon26 users 82 2008-10-05 17:35 .fsvs/6666cd76f96956469e7be39d750cc7d9/Urls [EMAIL PROTECTED] ~> fsvs status -v|grep "\.fsvs" ...... 1249 .fsvs/6666cd76f96956469e7be39d750cc7d9/Ign .t.... dir .fsvs/6666cd76f96956469e7be39d750cc7d9 .t.... dir .fsvs [EMAIL PROTECTED] ~> date Sun Oct 5 17:38:12 CEST 2008 [EMAIL PROTECTED] ~> fsvs commit Committing to svn+ssh://localhost/home/griffon26/repos/fsvsrepo/home-base .m.. dir .fsvs .m.. dir .fsvs/6666cd76f96956469e7be39d750cc7d9 committed revision 24 on 2008-10-05T15:38:19.590787Z as griffon26 [EMAIL PROTECTED] ~> ls -ald .fsvs/6666cd76f96956469e7be39d750cc7d9/Urls .fsvs/6666cd76f96956469e7be39d750cc7d9/ .fsvs/ drwx------ 4 griffon26 users 4096 2008-10-05 17:38 .fsvs/ drwx------ 2 griffon26 users 4096 2008-10-05 17:38 .fsvs/6666cd76f96956469e7be39d750cc7d9/ -rwx------ 1 griffon26 users 82 2008-10-05 17:38 .fsvs/6666cd76f96956469e7be39d750cc7d9/Urls [EMAIL PROTECTED] ~> fsvs status -v|grep "\.fsvs" ...... 1249 .fsvs/6666cd76f96956469e7be39d750cc7d9/Ign .t.... dir .fsvs/6666cd76f96956469e7be39d750cc7d9 .t.... dir .fsvs [EMAIL PROTECTED] ~> strace shows that a temporary Urls file is created and then moved over to Urls, but I guess you know this. Should I send a debug log of any of these commands? Thanks, Maurice. -- Maurice van der Pot Gentoo Linux Developer [EMAIL PROTECTED] http://www.gentoo.org Gnome Planner Developer [EMAIL PROTECTED] http://live.gnome.org/Planner
pgpXrE867asXj.pgp
Description: PGP signature
