[Adium-devl] Problems With Storing Info. for Contact

[George Armah]

Thanks for the help so far. I managed to resolve the conflicts and 
tested the plugin against
1.3svn r23817 for both Deployment and Deployment-Debug builds.
None of the reported problems occur with either of the two Adium builds 
(and I have done a fair
amount of testing).

When is the next major Adium release scheduled for and which version will
be released next after 1.25?

I think I'll clean up my code and wait to release the plugin with the 
next major Adium release
(which I hope will be 1.3) after some testing. Meanwhile, I'll spend 
what time I can
trying to troubleshoot the problem with 1.25.

Thanks again for the help,

George.



Graham Booker wrote:
>
> On Jun 6, 2008, at 7:48 AM, George Armah wrote:
>
>> Peter Hosey wrote:
>>> What does svn st say?
>>>   
>> M      Plugins/WebKit Message 
>> View/en.lproj/WebKitPreferencesView.nib/info.nib
>> M      Plugins/WebKit Message 
>> View/en.lproj/WebKitPreferencesView.nib/keyedobjects.nib
>> M      Plugins/WebKit Message 
>> View/en.lproj/WebKitPreferencesView.nib/classes.nib
>> M      Adium.xcodeproj/project.pbxproj
>> ?      Resources/MainMenu.nib/info.nib.r23802
>> ?      Resources/MainMenu.nib/keyedobjects.nib.r23802
>> ?      Resources/MainMenu.nib/classes.nib.r23802
>> ?      Resources/MainMenu.nib/info.nib.mine
>> ?      Resources/MainMenu.nib/keyedobjects.nib.mine
>> ?      Resources/MainMenu.nib/classes.nib.mine
>> ?      Resources/MainMenu.nib/info.nib.r23013
>> ?      Resources/MainMenu.nib/keyedobjects.nib.r23013
>> ?      Resources/MainMenu.nib/classes.nib.r23013
>> C      Resources/MainMenu.nib/info.nib
>> C      Resources/MainMenu.nib/keyedobjects.nib
>> C      Resources/MainMenu.nib/classes.nib
>>
>
> C means conflict.  That means you have modified the files locally, and 
> they were also modified on the server.  When you updated svn, it was 
> incapable of merging the two changes together, so it created a file 
> with the conflicts shown.
>
> Conflicts with nibs can be hard to resolve.  You may be best running 
> svn revert on those files and redoing your changes.
>> Thanks for the help !
>>
>> George.
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20080607/ce86a080/attachment-0001.html>