[Pidgin] #1187: Send Custom Emoticons in MSN

[Pidgin]

#1187: Send Custom Emoticons in MSN
-----------------------+----------------------------------------------------
  Reporter:  salinasv  |       Owner:  rlaager 
      Type:  patch     |      Status:  assigned
  Priority:  minor     |   Milestone:  2.2.3   
 Component:  MSN       |     Version:  2.0     
Resolution:            |    Keywords:          
   Pending:  0         |  
-----------------------+----------------------------------------------------
Comment (by Twain28):

 Replying to [comment:59 rlaager]:
 > You should put this patch in a branch in Monotone. See the
 UsingPidginMonotone branch if necessary.
 As Salinasv seems quite busy, I thought I could try this myself at home,
 using the huge mtn database supplied in the page suggested.

 >Get a checkout of the last version the patch worked on like this:
 >
 > mtn -d $DATABASE checkout -r dd6bb3a7d349ba0a9fe8cea9698aea8227a95658
 >
 > Then, apply the patch.
 Done.
 >Next, commit it as a branch (in the same namespace as similar things):
 mtn commit -b im.pidgin.cpw.khc.msnp14.ticket1187
 Dealing with a local mtn database, I did :
 {{{
 mtn -d pidgin.mtn --branch=im.pidgin.cpw.khc.msnp14.ticket1187 setup
 }}}
 then put all files to add to the branch in the same directory as the
 database file and
 {{{
 mtn add . -R
 }}}
 then I committed everything to the local database with
 {{{
 mtn -d pidgin.mtn commit --message='try'
 }}}
 I tried checking out the new branch thus obtained, and all was well, so I
 went on

 >merge up to the next revision (where it's broken): mtn explicit_merge
 d42c2c6500b8f7eb1ad6340caf7f1b95d9b02c1b
 h:im.pidgin.cpw.khc.msnp14.ticket1187 im.pidgin.cpw.khc.msnp14.ticket1187
 >
 that was, for me
 {{{
 mtn -d pidgin.mtn explicit_merge d42c2c6500b8f7eb1ad6340caf7f1b95d9b02c1b
 h:im.pidgin.cpw.khc.msnp14.ticket1187 im.pidgin.cpw.khc.msnp14.ticket1187
 }}}
 and returns me the following:
 {{{
 expanding selection h:im.pidgin.cpw.khc.msnp14.ticket1187
 expanded in 929db41c0cad0600c57da6da67425e537e462d0c
 mtn [left] d42c2c6500b8f7eb1ad6340caf7f1b95d9b02c1b
 mtn [right] 929db41c0cad0600c57da6da67425e537e462d0c
 mtn warning: rename target conflicts: nodes 7371, 676 both wanted parent
 0, name
 mtn warning: resolve non-content conflicts and then try again.
 merge failed due to unresolved conflicts
 }}}
 Is that something I did wrong?

-- 
Ticket URL: <http://developer.pidgin.im/ticket/1187#comment:60>
Pidgin <http://pidgin.im>
Pidgin