Changes between Version 114 and Version 115 of FAQ

Timestamp:

Jan 19, 2012 11:38:54 PM (12 years ago)

Author:

bennylp

Comment:

--

FAQ

@@ -91 +91 @@
 
 You can report issues and problem to our [http://lists.pjsip.org/mailman/listinfo/pjsip_lists.pjsip.org mailing list]. 
+
+=== How can I apply a fix from a particular ticket? === #afix
+
+Sometimes you see a ticket has been closed, and you want to incorporate that fix, but this fix is not yet contained in the latest release and will only be available in the next release. In this case you have two options:
+
+'''Option 1)''' Switch to using the SVN version instead of release version. This is recommended for ''stable'' branch, for example the 1.x branch, because a) you will then always get the latest fixes, and b) it makes it easier to sync with the latest source. The ''stable'' branch should be as good as release version because changes are normally restricted to bug fixes only.
+
+'''Option 2)''' Apply the ticket manually by following the steps below. Note that this may not be easy since a fix may depend on other fixes, and is probably not even feasible if the version that you have is too old.
+ a. Open the Trac ticket. For example, let's open #1364
+ a. Look in the '''Change-History''' section, and note '''all''' the ''changesets'' that have been applied for this ticket.
+    - There are two in the #1364 sample, i.e. [3743] and [3746]
+    - Changeset may be shown using ''[NNN]'' or ''rNNN'' format, e.g. [3743] or r3743. They are the same.
+ a. Open each changeset and download the '''raw''' patch by scrolling to the bottom of the changeset and click ''Download in other formats --> Unified diff''.
+ a. Apply '''each''' of the raw patch to your local pjsip copy, '''in order''' (low number first):
+    - For example:
+      {{{
+$ cd /path/to/your/pjsip
+$ patch -p4 --dry-run < changeset_r3743.diff
+      }}}
+    - You will need to adjust the number in "-p" option. See ''patch'' manual.
+    - '''Don't forget''' to remove ''--dry-run'' option once you're happy with the patch test.
+    - Don't forget to apply the remaining patches, if any.
 
 ----