Re: Why does everything now want ncurses-bootstrap, which doesn't build???

On 24 Aug 2019, at 1:22, Joshua Root wrote: It's possible that the problem will go away if you uninstall clang-3.4 and llvm-3.4. The bootstrap ports are only needed as dependencies of those, and you shouldn't need clang-3.4 any more once you've bootstrapped something newer. I tried variations

Re: How do I merge my own fork with updates from the main fork

Hi, The names remotes are given are completely arbitrary. It s normal to have one called origin, and the rest something else, but it is not mandatory to have that. It is true the instructions below in places assume you will call your fork origin and the main MP one something else, and I tend t

Re: How do I merge my own fork with updates from the main fork

Yes, those were among the instructions I followed. But that gets me the situation of which now is said doesn’t fit with port sync. e.g. those instructions means my own fork is called origin and the macports fork is called upstream. But port sync assumes differently (if I understand it correctly)

Re: How do I merge my own fork with updates from the main fork

> On 24 Aug 2019, at 3:47 pm, Ryan Schmidt wrote: > > > >> On Aug 24, 2019, at 07:55, Gerben Wierda wrote: >> >> 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 whol

Re: How do I merge my own fork with updates from the main fork

On Aug 24, 2019, at 07:55, Gerben Wierda wrote: > 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 le

Re: How do I merge my own fork with updates from the main fork

Hi, > On 24 Aug 2019, at 1:55 pm, Gerben Wierda wrote: > > Thanks. > >> On 24 Aug 2019, at 12:40, Chris Jones > > wrote: >> >> I recommend changing [the setup] so the primary macports repo is called >> origin, and you call your fork something. Things tend to w

Re: How do I merge my own fork with updates from the main fork

Thanks. > On 24 Aug 2019, at 12:40, Chris Jones wrote: > > 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. OK. So how do I rename these? Or how should I have created them in the f

Re: How do I merge my own fork with updates from the main fork

Hi, 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. If you wish to make new commits, for each in order to eventu

Re: How do I merge my own fork with updates from the main fork

> On 24 Aug 2019, at 1:28 pm, Christopher Jones > wrote: > > Hi, > > If you have unstated changes, you have to stash them before rebasing. unstated -> unstaged …. > > That is why I suggested to use > > sudo port sync > > as it handles all this for you. Under the hood it does > > git pu

Re: How do I merge my own fork with updates from the main fork

Hi, If you have unstated changes, you have to stash them before rebasing. That is why I suggested to use sudo port sync as it handles all this for you. Under the hood it does git pull —rebase —autostash origin master assuming origin is the primary MacPorts repo. Chris > On 24 Aug 2019, at

Re: How do I merge my own fork with updates from the main fork

This was helpful, except that the rebase failed. There were changes. I tried to repair but failed. Albus:macports-ports sysbh$ git fetch --all --prune Fetching origin Fetching upstream remote: Enumerating objects: 33, done. remote: Counting objects: 100% (33/33), done. remote: Compressing objects

Re: How do I merge my own fork with updates from the main fork

> On 24 Aug 2019, at 11:32 am, miniupnp wrote: > > Hello, > > Well, it looks like you have added 6 commits in you master branch. > $ git status > should tell you that. > Merging upstream/master doesn't remove theses commits. > It just "merges" new commits from the upstream/master branch into

Re: How do I merge my own fork with updates from the main fork

Hello, Well, it looks like you have added 6 commits in you master branch. $ git status should tell you that. Merging upstream/master doesn't remove theses commits. It just "merges" new commits from the upstream/master branch into your current branch. To understand what is in your branch, you shou

Re: How do I merge my own fork with updates from the main fork

Let me add that after the commands below, I get Warning: port definitions are more than two weeks old, consider updating them by running 'port selfupdate'. I’m a bit worried about having both the port command and git update the same tree. Gerben Wierda Chess and the Art of Enterprise Architect

How do I merge my own fork with updates from the main fork

I’ve created my own git fork of macports to work on port updates (have submitted one pull request so far). Now ether is (for me) macports/macports-ports and gctwnl/macports-ports (the one from which I’ve created a pull request). It is not perfectly clear to me how I get the updates from macpor