<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">I have my own fork&clone of macports-ports in case I want to do maintenance. Getting a clean local clone for me means:<div class=""><br class=""></div><div class=""><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""># First, do an update of macports base only (does not update the ports tree):</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""><br class=""></font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class="">sudo port selfupdate --no-sync</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""><br class=""></font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""># Updating the master of my fork&clone from the master of the original:</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""><br class=""></font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class="">git checkout master<span class="Apple-tab-span" style="white-space:pre"> </span># Go to branch master in my local clone</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class="">git pull upstream master<span class="Apple-tab-span" style="white-space:pre"> </span># Update my local clone master from the master of the remote upstream</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># (overwrites my local master with remote github/macports/master)</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class="">git reset --hard upstream/master<span class="Apple-tab-span" style="white-space:pre"> </span># Resets index and working tree of local clone/master from remote upstream</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class="">git push origin master --force <span class="Apple-tab-span" style="white-space:pre"> </span># Push local clone (~/MacPortsDev/macports-ports) master back</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># to my own remote fork (github/gctwnl/macports-ports)</font></span></div><div class=""><span style="font-style: normal; font-size: 11px;" class=""><font face="Menlo" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># NOTE: this closes all open pull-requests!</font></span></div><div class=""><span style="font-family: Menlo; font-size: 11px;" class="">portindex</span><span class="Apple-tab-span" style="font-family: Menlo; font-size: 11px; white-space: pre;"> </span><span style="font-family: Menlo; font-size: 11px;" class=""># Tell macports to use this tree and update the macports index</span></div></div><div class=""><br class=""></div><div class="">Apparently, in the past UI have accidentally done some of this as root, so this failed because parts of the macports-ports clone were owned by root.</div><div class=""><br class=""></div><div class="">So, I did a chown -R on that tree and tried again, but now I get</div><div class=""><br class=""></div><div class=""><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">albus:macports-ports sysbh$ git pull upstream master</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">From <a href="https://github.com/macports/macports-ports" class="">https://github.com/macports/macports-ports</a></span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> * branch master -> FETCH_HEAD</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">Updating e0a3df02c73..eca5c1226ee</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">error: Your local changes to the following files would be overwritten by merge:</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><span class="Apple-tab-span" style="white-space:pre"> </span>_resources/port1.0/checks/implicit_function_declaration/macosx10.10.sdk.list</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><span class="Apple-tab-span" style="white-space:pre"> </span>_resources/port1.0/checks/implicit_function_declaration/macosx10.11.sdk.list</span></div></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class="">…</span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">error: The following untracked working tree files would be overwritten by merge:</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><span class="Apple-tab-span" style="white-space:pre"> </span>aqua/qt5/files/patch-qtwebengine_gn_binary_path.diff</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><span class="Apple-tab-span" style="white-space:pre"> </span>comms/s710/files/dynamic_lookup-11.patch</span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div></span></div><div class="">So I tried to do </div><div class=""><br class=""></div><div class=""><span style="font-family: Menlo; font-size: 11px;" class="">git reset --hard upstream/master</span></div><div class=""><br class=""></div><div class="">and apparently this did work as another pull did nothing. But before I push that back to my own clone: have I done anything wrong? Is my local tree in order now?</div><div class=""><br class=""></div><div class=""><div class="">
<div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div><div class="">Gerben Wierda (<a href="https://www.linkedin.com/in/gerbenwierda" class="">LinkedIn</a>)</div><div class=""><a href="https://ea.rna.nl/" class="">R&A IT Strategy</a> (main site)<br class="">Book: <a href="https://ea.rna.nl/the-book/" class="">Chess and the Art of Enterprise Architecture</a><br class="">Book: <a href="https://ea.rna.nl/the-book-edition-iii/" class="">Mastering ArchiMate</a><br class=""></div></div></div></div></div></div></div></div></div>
</div>
<br class=""></div></body></html>