[Pidgin] #1187: Send Custom Emoticons in MSN
Pidgin
trac at pidgin.im
Sat Oct 20 17:56:55 EDT 2007
#1187: Send Custom Emoticons in MSN
-----------------------+----------------------------------------------------
Reporter: salinasv | Owner: rlaager
Type: patch | Status: assigned
Priority: minor | Milestone: 2.2.2
Component: MSN | Version: 2.0
Resolution: | Keywords:
Pending: 0 |
-----------------------+----------------------------------------------------
Comment (by rlaager):
You should put this patch in a branch in Monotone. See the
UsingPidginMonotone branch if necessary. Get a checkout of the last
version the patch worked on like this:
mtn -d $DATABASE checkout -r dd6bb3a7d349ba0a9fe8cea9698aea8227a95658
Then, apply the patch. Next, commit it as a branch (in the same namespace
as similar things): mtn commit -b im.pidgin.cpw.khc.msnp14.ticket1187
After that, 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
Then, make it work and commit your changes. After that: mtn propagate
im.pidgin.pidgin im.pidgin.cpw.khc.msnp14.ticket1187
Then you'll be merged up with head and hopefully it'll still work. If not,
fix it and commit your changes. Then let me (or another developer) know
and we can pull the changes from you and push them into our central
repository.
--
Ticket URL: <http://developer.pidgin.im/ticket/1187#comment:59>
Pidgin <http://pidgin.im>
Pidgin
More information about the Tracker
mailing list