On Sunday 27 August 2006 03:30 Gunter Ohrner wrote:
> Mh, I'm not sure if you really want to hear the results... ;)
>
> At least the error message changed:
...
> 03:27:42.982 up__add_entry[update.c:387] add 
entry .kde/share/apps/kwallet/kdewallet_zb.kwl
> 03:27:42.982 ops__find_entry_byname[est_ops.c:620] found kdewallet_zb.kwl on 
0x826c878; ignored: 0x2
>
> An error occurred at 03:27:42.983: Die Datei existiert bereits (17)
>   in up__add_entry [update.c:403]:
> file .kde/share/apps/kwallet/kdewallet_zb.kwl already exists
>   in up__add_file [update.c:685]
>   in update_work [update.c:1104]: reporter->finish_report: up__add_file
>   in update_work [update.c:1114]: up__add_file
>   in main [fsvs.c:524]: action update failed
You've strange times for working :-)

Could you try another sync-repos before update, please?

But that probably wouldn't help ... There's some kind of conflict here - A 
file should be added, but it already exists locally.

What should fsvs do? Get the file to a temporary name, take it if it's 
identical (MD5 available after transfer), and leave it with something 
like .fsvs-conflict if it's not?


Wait a minute ... what did happen?
You put that file on machine A into the repository, overwrote it on B (after 
sync and commit) with a newer version ... why should fsvs think that it's 
new? Because the "last" revision this working copy is at is wrong.
Could you do a "fsvs info" in your home? To see what revision you wc root is 
at?

Thank you.


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]

Reply via email to