Diff for /wikisrc/users/ryoon/how_to_update_www_firefox.mdwn between versions 1.7 and 1.8

version 1.7, 2015/01/16 14:04:45 version 1.8, 2016/06/06 12:14:56
Line 26  You should follow "Using Bookmarks to Ma Line 26  You should follow "Using Bookmarks to Ma
   
 Find latest release.  Find latest release.
   
         $ hg branches | grep 2901          $ hg tags|grep 46_
         GECKO2901_2014050617_RELBRANCH 207485:3fd2b5510ccf          (snip)
           FIREFOX_46_0_1_RELEASE          341775:0b8492c110be
         (snip)          (snip)
   
 Checkout the branch.  Checkout the branch.
   
         $ hg checkout GECKO2901_2014050617_RELBRANCH          $ hg checkout FIREFOX_46_0_1_RELEASE
   
 Create named branch for applying pkgsrc patches  Create named branch for applying pkgsrc patches
   
         $ hg branch pkgsrc_firefox-29.0.1          $ hg branch pkgsrc_firefox-46.0.1
         $ hg commit -m "Create pkgsrc_firefox-29.0.1 branch for applying pkgsrc patches"          $ hg commit -m "Create pkgsrc_firefox-46.0.1 branch for applying pkgsrc patches"
   
 Add .*\.orig$ to .hgignore, and commit this change  Add .*\.orig$ to .hgignore, and commit this change
   
Line 51  Add .*\.orig$ to .hgignore, and commit t Line 52  Add .*\.orig$ to .hgignore, and commit t
         $ popd          $ popd
         $ cat /usr/pkgsrc/www/firefox/patches/patch-*|patch -p0          $ cat /usr/pkgsrc/www/firefox/patches/patch-*|patch -p0
         $ hg add ...(necessary files)          $ hg add ...(necessary files)
         $ hg commit -m "Apply pkgsrc patches for firefox-29.0.1nb2"          $ hg commit -m "Apply pkgsrc patches for firefox-46.0.1nb1"
   
   
 # Checkout latest beta source, and create your branch  # Checkout latest beta source, and create your branch
   
 Find latest branch.  Find latest branch.
   
         $ hg branches | grep 300b9          $ hg tags | grep 47_
         GECKO300b9_2014052918_RELBRANCH 199964:b7037f050049          (snip)
           FIREFOX_47_0b9_RELEASE          341367:2ee4473c729a
           (snip)
   
 Checkout the branch.  Checkout the branch.
   
         $ hg checkout GECKO300b9_2014052918_RELBRANCH          $ hg checkout FIREFOX_47_0b9_RELEASE
   
 Create named branch for working.  Create named branch for working.
   
         $ hg branch ryoon_firefox-30.0b9          $ hg branch ryoon_firefox-47.0b9
         $ hg commit -m "Create ryoon_firefox-30.0 branch for applying freebsd-gecko patches"          $ hg commit -m "Create ryoon_firefox-47.0 branch for merging pkgsrc patches"
   
 Add .*\.orig$ to .hgignore, and commit this change  Add .*\.orig$ to .hgignore, and commit this change
   
         $ hg commit -m "Ignore .orig files" .hgignore          $ hg commit -m "Ignore .orig files" .hgignore
   
 Apply patches from freebsd-gecko  
   
         $ cat ~/repos/freebsd-gecko/trunk/www/firefox/files/patch-*|patch -p0  
   
 Fix rejected patches manually  
   
         $ hg status | grep rej$  
         $ vi path/to/a/certain/file.c  
   
 Commit the patches  
   
         $ hg add (necessary files)  
         $ hg commit -m "Apply freebsd-gecko patches for firefox-30.0"  
   
   
 # Merge your patches  # Merge your patches
   
         $ hg merge pkgsrc_firefox-29.0.1          $ hg merge pkgsrc_firefox-46.0.1
         $ hg resolve -l          $ hg resolve -l
         $ vi file/marked/as/U          $ vi file/marked/as/U
         $ hg resolve --mark file/marked/as/U          $ hg resolve --mark file/marked/as/U
         (loop)          (loop)
         $ hg commit -m "Merge pkgsrc_firefox-29.0.1 branch to 30.0"          $ hg commit -m "Merge pkgsrc_firefox-46.0.1 branch to 47.0"
   
   
 # Create patch file for patch -p0  # Create patch file for patch -p0
   
         $ hg diff -r (revision of first commit in ryoon_freebsd-30.0) | \          $ hg diff -r (revision of first commit in ryoon_firefox-47.0b9) | \
         sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-30.0.diff          sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-47.0.diff
         $ vi ~/firefox-30.0.diff          $ vi ~/firefox-47.0.diff
         (Remove patch to .hgignore)          (Remove patch to .hgignore)
         (Remove patch to .hgtags)          (Remove patch to .hgtags)
   
Line 117  Commit the patches Line 105  Commit the patches
         $ make mdi          $ make mdi
         $ make extract          $ make extract
         $ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta          $ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta
         $ patch -p0 < ~/firefox-30.0.diff          $ patch -p0 < ~/firefox-47.0.diff
         $ popd          $ popd
         $ mkpatches          $ mkpatches
         $ patchdiff          $ patchdiff

Removed from v.1.7  
changed lines
  Added in v.1.8


CVSweb for NetBSD wikisrc <wikimaster@NetBSD.org> software: FreeBSD-CVSweb