<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=""><div><div class="">Thanks.</div><br class=""><blockquote type="cite" class=""><div class="">On 24 Aug 2019, at 12:40, Chris Jones <<a href="mailto:jonesc@hep.phy.cam.ac.uk" class="">jonesc@hep.phy.cam.ac.uk</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; 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;" class="">I recommend changing [the setup] so the primary macports repo is called origin, and you call your fork something. Things tend to work more smoothly this way.</div></div></blockquote><br class=""></div><div><div class="">OK. So how do I rename these? Or how should I have created them in the first place? I can of course throw everything away and start anew. At this point, I need to find out how to get back to a working situation.</div><div class=""><br class=""></div></div><div class=""><div class=""></div><blockquote type="cite" class=""><div class="">If you have unstated changes, you have to stash them before rebasing.</div></blockquote><div class=""><br class=""></div><div class="">’stash’ is just ‘move them out of the way’ or is it something git?</div><br class=""><blockquote type="cite" class=""><div class=""><div class="">That is why I suggested to use </div><div class=""><br class=""></div><div class="">sudo port sync</div><div class=""><br class=""></div><div class="">as it handles all this for you. Under the hood it does</div><div class=""><br class=""></div><div class="">git pull —rebase —autostash origin master</div><div class=""><br class=""></div><div class="">assuming origin is the primary MacPorts repo.</div></div></blockquote><div class=""><div class=""><br class=""></div><div class="">Aha.</div><div class=""><br class=""></div><div class="">I have of course two repos:</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="">/opt/local/var/macports/sources/<span class=""><a href="http://rsync.macports.org/macports/release/tarballs/ports" class="">rsync.macports.org/macports/release/tarballs/ports</a></span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class="">~/MacPortsDev/macports-ports</div></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><br class=""></div><div style="margin: 0px; font-stretch: normal; line-height: normal;" class="">And my sources.conf says:</div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><br class=""></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><div style="margin: 0px; font-stretch: normal; line-height: normal;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><a href="file:///Users/sysbh/MacPortsDev/macports-ports" class="">file:///Users/sysbh/MacPortsDev/macports-ports</a></span></div><div style="margin: 0px; font-stretch: normal; line-height: normal;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><a href="rsync://rsync.macports.org/macports/release/tarballs/ports.tar" class="">rsync://rsync.macports.org/macports/release/tarballs/ports.tar</a> [default]</span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class="">So that ~/MacPortsDev/macports-ports is the tree used for the port install etc. commands</div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><br class=""></div><div class=""><div dir="ltr" class=""></div></div><blockquote type="cite" class=""><div class=""><div dir="ltr" class="">B.t.w. Its very much bad practise to make new commits directly to the master branch of your own fork. You should keep your master clean and only pull into it from the primary macports master, using the commands I just sent around.</div></div></blockquote><div class=""><br class=""></div><div class="">Yeah, I understand. It was the current status though.</div><div class=""><br class=""></div><div class="">I have been trying to follow instructions but I am trying to prevent to have to become a git expert (there is insufficient time for that available, such as studying a whole git book). Just knowing some basic recipes for actions/steps lets me concentrate on the actual stuff I want to do that is potentially contributing to ports.</div><div class=""><br class=""></div><div class="">G</div></div></div></body></html>