On Sunday 05 October 2008 Maurice van der Pot wrote:
> 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?
Well, after an update or commit the new entries file is written - but that
should only happen *after* the other data has been handled.
What does a "status -C -C -C" say? Maybe the size hasn't changed, and the
timestamp gets re-read wrong.
> > 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.
That's surely better.
> > 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.
...
> strace shows that a temporary Urls file is created and then moved over to
> Urls, but I guess you know this.
Yes ... FSVS uses $FSVS_WAA and $FSVS_CONF for temporary files, which get
moved to their destination if they could be written completely.
> Should I send a debug log of any of these commands?
Please wait a few days ... I'm just a small bit away from a new release, and
I've changed some internal handling for update/commit etc., so that it's
cleaner.
Maybe that's already solved, too.
Regards,
Phil
--
Versioning your /etc, /home or even your whole installation?
Try fsvs (fsvs.tigris.org)!
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
