From: tuxillo <tuxillo@web>
Date: Sun, 2 Sep 2018 18:38:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://gitweb.dragonflybsd.org/ikiwiki.git/commitdiff_plain/5ab60424464575d8193d57f84eb77de21c88aa55

---

diff --git a/docs/howtos/HowToUpdateChromium/index.mdwn b/docs/howtos/HowToUpdateChromium/index.mdwn
index 5b0deea2..e94b4211 100644
--- a/docs/howtos/HowToUpdateChromium/index.mdwn
+++ b/docs/howtos/HowToUpdateChromium/index.mdwn
@@ -108,12 +108,25 @@ Now create a branch for FreeBSD:
     # cd chromium-dfly
     # git checkout -b 68-freebsd crater/chromium-68.0.3440.106
 
-Apply all FreeBSD patches to your new branch:
+Apply all FreeBSD patches to your new branch. Make sure all patches apply cleanly, there should be no .rej files and all .orig files should be removed. If there are any .orig files originally in the Chromium repo you can either decide to remove them or restore them:
 
     # git rev-parse --abbrev-ref HEAD
     68-freebsd
     # sh -c 'for p in ~/s/freebsd-ports/www/chromium/patch*; do patch -p0 < $p; done'
+    # find . -iname "*.rej"
+    # find . -iname "*.orig" -delete
 
+Now all FreeBSD patches should be in, make sure the 'git status' command shows a sane list, that there is no files left behind, etc. Also 'git status --ignored' and 'git ls-files -mo' should have the same amount of iles:
+
+    # git status --ignored | less
+    # git ls-files -mo |wc -l                                               
+     609
+    # git status --ignored --porcelain | wc -l
+     609
+
+All changes should be committed with one rule: one file per commit, since it makes merges more granular and there are potentially a lot of merges to be done:
+
+    # sh -c 'for f in $(git ls-files -mo); do git add $f ; git commit -m "$f"; done'
 
 ## Appendix