[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 rlaager):

 Twain28: If you have pulled the revision from salinasv, then you shouldn't
 be screwing with applying patches. Given that you've already done the
 work, though, you want to do something like this:

 1. Ask salinasv to make sure the patch is on a branch of its own. The
 naming doesn't really matter, but I'd recommend something like this:
 im.pidgin.cpw.salinasv.ticket1187. If it's not already on a branch of its
 own, then salinasv should run: mtn approve -b NEW_BRANCH
 REVISION_WITH_THE_CHANGES

 2. Pull the changes from salinasv.

 3. From a clean checkout of the im.pidgin.pidgin branch (i.e. upstream
 trunk), run: mtn merge_into_workspace
 h:THE_NAME_OF_THE_BRANCH_FROM_SALINASV

 4. Make sure everything works. You may need to redo some of the changes
 that you made when developing your updated patch.

 5. mtn commit -b THE_NAME_OF_THE_BRANCH_FROM_SALINASV

 6. Push your changes back to salinasv.

 This process will go much smoother if you'd use the version control system
 to your advantage instead of trying go around its back and manually work
 with patches.

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