Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: fsvs use case

fsvs
Discussion topic

Back to topic list

Re: fsvs use case

Author Stuart Lester <stuart dot lester at gmail dot com>
Full name Stuart Lester <stuart dot lester at gmail dot com>
Date 2008-08-29 06:36:53 PDT
Message For what it's worth...it appears as though, on the system being
updated, any file that is updated causes this conflict...in a fit of
desperation, I'm deleting each file as it causes the error, just to
see if we can get the system to an "updated" state.

Stu

On Fri, Aug 29, 2008 at 9:30 AM, Stuart Lester <stuart dot lester at gmail dot com> wrote:
> That worked...except now I'm seeing the error on files:
> dev-01 / # fsvs update
> Updating svn+ssh://user@svnse​rver//home/hydra/svn​/obx to revision 35.
> .m.. dir dev
> .m.. dir etc
> .mC. 1323 opt/hydra-client/bin/restore.sh
> .mC. 1830 opt/hydra-client/bin/backup.sh
> .m.. dir opt/hydra-client/bin
> .m.. dir opt/hydra-client/tem​plates/etc/samba
> .m.. 12 var/db/pkg/dev-util/​fsvs-1.1.16/PF
> .m.. 42 var/db/pkg/dev-util/​fsvs-1.1.16/USE
> .m.. 2 var/db/pkg/dev-util/​fsvs-1.1.16/EAPI
> .m.. 24 var/db/pkg/dev-util/​fsvs-1.1.16/HOMEPAGE​
> .m.. 2 var/db/pkg/dev-util/​fsvs-1.1.16/SLOT
> The entry ./var/db/pkg/dev-uti​l/fsvs-1.1.16/CONTEN​TS has changed locally
>
> Stu
>
> On Fri, Aug 29, 2008 at 5:00 AM, Philipp Marek <philipp at marek dot priv dot at> wrote:
>> Hello Stuart!
>>
>> On Thursday 28 August 2008 Stuart Lester wrote:
>>> Hey, at this point, I'll take all the help I can get...
>>>
>>> I ran the following command to generate the log:
>>>
>>> dev-01 log # fsvs update -d > /var/log/fsvs_update.log 2>&1
>>>
>>> This created a BIG file (400MB+) and was still rather large when
>>> gzip-ed (30MB). Instead, I took the last 100,000 lines and zipped
>>> them up....if you need the whole thing, just let me know.
>>
>> The important line is this:
>>> 14:19:10.054 rev___undo_change[revert.c:960]
>>> ./opt/hydra-client/bin has changed: mode=040775,
>>> r=220(mtime, child),
>>> l=228(mtime, child, likely)
>>
>> Does the attached patch help?
>> It should at least paper over the problem.
>>
>> I still don't know why I can't reproduce that, but I'll try harder :-)
>>
>>
>>
>> Index: revert.c
>> ====================​====================​====================​=======
>> --- revert.c (Revision 1872)
>> +++ revert.c (Arbeitskopie)
>> @@ -961,8 +961,10 @@ int rev___undo_change(struct estat *sts,
>>
>> unique_name_mine=NULL;
>>
>> - /* Conflict handling; depends whether it has changed locally. */
>> - if (sts->entry_status & (FS_CHANGED | FS_CHILD_CHANGED))
>> + /* Conflict handling; depends whether it has changed locally.
>> + * Directories have no conflict (unless they're replaced).
>> + * \todo: Need test-cases for that. */
>> + if (!S_ISDIR(sts->st.mode) && (sts->entry_status & FS_CHANGED))
>> switch (opt__get_int(OPT__CONFLICT))
>> {
>> case CONFLICT_STOP:
>>
>>
>> --
>> Versioning your /etc, /home or even your whole installation?
>> Try fsvs (fsvs.tigris.org)!
>>
>> --------------------​--------------------​--------------------​---------
>> To unsubscribe, e-mail: users-unsubscribe@fs​vs.tigris.org
>> For additional commands, e-mail: users-help at fsvs dot tigris dot org
>>
>>
>

« Previous message in topic | 10 of 14 | Next message in topic »

Messages

Show all messages in topic

fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-26 10:32:01 PDT
     Re: fsvs use case pmarek P.Marek 2008-08-27 01:44:58 PDT
         Re: fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-27 07:45:39 PDT
             Re: fsvs use case pmarek P.Marek 2008-08-27 09:05:14 PDT
                 Re: fsvs use case griffon26 Maurice van der Pot 2008-08-27 11:50:22 PDT
                 Re: fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-28 08:14:47 PDT
                     Re: fsvs use case pmarek P.Marek 2008-08-28 09:09:01 PDT
                         Re: fsvs use case pmarek P.Marek 2008-08-29 02:00:47 PDT
                             Re: fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-29 06:30:56 PDT
                                 Re: fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-29 06:36:53 PDT
                                     Re: fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-29 08:21:37 PDT
                                         Re: fsvs use case pmarek P.Marek 2008-08-29 11:32:20 PDT
                                             Re: fsvs use case Stuart Lester <stuart dot lester at gmail dot com> Stuart Lester <stuart dot lester at gmail dot com> 2008-08-29 12:27:55 PDT
                                                 Re: fsvs use case pmarek P.Marek 2008-08-30 00:03:29 PDT
Messages per page: