Changes between Version 48 and Version 49 of UpdatingBugzilla

Timestamp:

Feb 10, 2017 11:33:30 AM (7 years ago)

Author:

ddkilzer@apple.com

Comment:

--

UpdatingBugzilla

@@ -63 +63 @@
 == Update ==
 
- * Update git-svn of `Websites`bugs.webkit.org` in svn.
+ * Update git-svn of `Websites/bugs.webkit.org` in svn.
 {{{
     cd bugzilla.git
@@ -79 +79 @@
 == Merge ==
 
+The instructions below assume that Bugzilla was previously merged to `release-4.2.11` and is being updated to `release-5.0.3`.
+
  * Merge a new release of Bugzilla using an upstream tag.
 {{{
@@ -87 +89 @@
 
  * Clean up any conflicts when the merge is done.
+  * To check if there were previously local changes on master:
+{{{
+    git diff release-4.2.11..master path/to/file
+}}}
+  * To check for current differences to the merge target:
+{{{
+    git diff release-5.0.3 path/to/file
+}}}
 
  * Locate any customize templates that no longer exist: