Phil,
A little progress (and maybe a resolution). You mentioned the
"conflict" option in an earlier reply/post. I think that's probably
key to resolving this...we want to set that to "remote". I don't know
how to do that. I believe, after looking through the docs, that the
option we need is:
-oconflict=remote
Is this correct?
Stu
On Fri, Aug 29, 2008 at 9:36 AM, Stuart Lester <[EMAIL PROTECTED]> wrote:
> 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 <[EMAIL PROTECTED]> wrote:
>> That worked...except now I'm seeing the error on files:
>> dev-01 / # fsvs update
>> Updating svn+ssh://[EMAIL PROTECTED]//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/templates/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-util/fsvs-1.1.16/CONTENTS has changed locally
>>
>> Stu
>>
>> On Fri, Aug 29, 2008 at 5:00 AM, Philipp Marek <[EMAIL PROTECTED]> 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: [EMAIL PROTECTED]
>>> For additional commands, e-mail: [EMAIL PROTECTED]
>>>
>>>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
