On 2018-04-27 23:47, Ryan Schmidt wrote:
> The repository permissions are deliberately set to prohibit force pushes that
> change the history of master or release branches. Changing history causes
> problems that we want to avoid.
I understand. That's why I said "depending on the repo and its
s
On Apr 27, 2018, at 22:27, Helmut K. C. Tessarek wrote:
> On 2018-04-27 22:34, Perry E. Metzger wrote:
>> It was a bunch of work figuring out exactly what to do (it took me
>> almost an hour) but I think I've done a proper revert commit.
>
> If you have any git related questions, please drop me
On 2018-04-27 22:34, Perry E. Metzger wrote:
> It was a bunch of work figuring out exactly what to do (it took me
> almost an hour) but I think I've done a proper revert commit.
If you have any git related questions, please drop me an email.
I'm not an absolute git expert, but I had my fair share
I visually checked the commit SHAs and what you've done looks right:
it's a revert of a series of commits that appear to match the ones laid
out earlier.
For others: `git revert -n` allows the building of a series of commits
to be reverted in a single commit, versus 17 additional reverting
commits
I know this was already reverted from master because you meant to do it on a
branch, but:
On Apr 27, 2018, at 17:33, Marcus Calhoun-Lopez wrote:
> Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
> in repository macports-ports.
>
>
> https://github.com/macports/macp
git revert with the beginning and ending commits?
> On Apr 27, 2018, at 6:59 PM, Perry E. Metzger wrote:
>
> So I tried to do some repo surgery to fix Marcus Calhoun-Lopez's
> commits, since there were only two commits after his change.
>
> I "git reset --hard" back past where he damaged the re
On Apr 27, 2018, at 18:24, Rainer Müller wrote:
> destroot {} is exactly meant for this kind of code. If muniversal cannot
> handle it, supporting +universal is not important enough for me to maintain
> this.
muniversal does not support overridden destroot blocks. It requires the ability
to r
On Sat, 28 Apr 2018 02:23:01 + Zero King
wrote:
> >Anyone have suggestions for alternatives? Should we just merge a
> >reversal? (I may do that temporarily anyway.)
>
> Use "git revert" for that. We intentionally disabled force pushing
> because it could cause trouble for forks and our infr
It was a bunch of work figuring out exactly what to do (it took me
almost an hour) but I think I've done a proper revert commit.
If someone like Zero King could double check my work I'd appreciate
it.
Marcus, please be more careful in the future.
Perry
On Fri, 27 Apr 2018 18:26:00 -0700 Marcus
On Fri, Apr 27, 2018 at 09:59:59PM -0400, Perry E. Metzger wrote:
So I tried to do some repo surgery to fix Marcus Calhoun-Lopez's
commits, since there were only two commits after his change.
I "git reset --hard" back past where he damaged the repo, cherry
picked the two revisions after that, an
On Apr 26, 2018, at 10:16, Ryan Schmidt wrote:
>> Not quite. I'm noting that the package version isn't a reliable
>> indication of the ABI version, and neither (sadly, see the current
>> protobuf issues and the issues with LibreSSL) is the library dylib
>> name. Thus I'm proposing to have an inte
So I tried to do some repo surgery to fix Marcus Calhoun-Lopez's
commits, since there were only two commits after his change.
I "git reset --hard" back past where he damaged the repo, cherry
picked the two revisions after that, and then tried to
"git push --force" -- this should have re-set the ma
Unfortunately, there were 17 commits in total.
They are:
https://github.com/macports/macports-ports/commit/ad74231453310610fd7432adb93fb5110ad4157d
https://github.com/macports/macports-ports/commit/8129b740cee3af8924b19df302ca1ab5cc2c5be1
https://github.com/macports/macports-ports/commit/ef8a319b93
On Fri, 27 Apr 2018 16:33:23 -0700 Marcus Calhoun-Lopez
wrote:
> Recently, I made some major changes to the cargo PortGroup and the
> Portfiles of several people. My intent was:
> *) create a branch
> *) solicit feedback on the branch with the changes
>
> Instead, I pushed the changes
Recently, I made some major changes to the cargo PortGroup and the Portfiles of
several people.
My intent was:
*) create a branch
*) solicit feedback on the branch with the changes
Instead, I pushed the changes to master.
It was very careless of me, and I sincerely apologize to al
On 2018-04-28 00:34, Marcus Calhoun-Lopez wrote:
> Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
> in repository macports-ports.
>
> https://github.com/macports/macports-ports/commit/68a34f577814e3e5b3f444530262b109093da515
>
> commit 68a34f577814e3e5b3f444530262b10909
On 2018-04-28 00:34, Marcus Calhoun-Lopez wrote:
> Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
> in repository macports-ports.
>
> https://github.com/macports/macports-ports/commit/24864aeda99bedbc183f882878df70e8b555aa0b
>
> commit 24864aeda99bedbc183f882878df70e8b5
On Fri, 27 Apr 2018 16:23:19 -0500 Ryan Schmidt
wrote:
> On Apr 27, 2018, at 16:22, Rainer Müller wrote:
> > The workaround for move could as well be applied to 'file move'
> > and eliminate the wrapper. It is possible to rename builtin
> > commands.
>
> Whatever you want to do.
Regardless of
On Apr 27, 2018, at 16:22, Rainer Müller wrote:
> On 27 April 2018 23:12:31 GMT+02:00, Ryan Schmidt wrote:
>>
>> On Apr 27, 2018, at 16:11, Joshua Root wrote:
>>
>>> On 2018-4-28 06:25 , Ryan Schmidt wrote:
>>>
On Apr 27, 2018, at 08:10, Joshua Root wrote:
> 'move' still h
On 27 April 2018 23:12:31 GMT+02:00, Ryan Schmidt
wrote:
>
>On Apr 27, 2018, at 16:11, Joshua Root wrote:
>
>> On 2018-4-28 06:25 , Ryan Schmidt wrote:
>>
>>> On Apr 27, 2018, at 08:10, Joshua Root wrote:
>>>
>>>
'move' still handles some case-sensitivity issues, but indeed
>'copy' and
>>
On Apr 27, 2018, at 16:11, Joshua Root wrote:
> On 2018-4-28 06:25 , Ryan Schmidt wrote:
>
>> On Apr 27, 2018, at 08:10, Joshua Root wrote:
>>
>>
>>> 'move' still handles some case-sensitivity issues, but indeed 'copy' and
>>> 'delete' are just aliases these days. I think we don't need to
>>>
On 2018-4-28 06:25 , Ryan Schmidt wrote:
>
> On Apr 27, 2018, at 08:10, Joshua Root wrote:
>
>
>> 'move' still handles some case-sensitivity issues, but indeed 'copy' and
>> 'delete' are just aliases these days. I think we don't need to
>> discourage the use of 'file', since if you hit the one f
On Apr 27, 2018, at 08:10, Joshua Root wrote:
> 'move' still handles some case-sensitivity issues, but indeed 'copy' and
> 'delete' are just aliases these days. I think we don't need to
> discourage the use of 'file', since if you hit the one fairly rare case
> where there's a difference you'll
On Apr 27, 2018, at 08:18, Clemens Lang wrote:
> Clemens Lang (neverpanic) pushed a commit to branch master
> in repository macports-ports.
>
>
> https://github.com/macports/macports-ports/commit/28e47077426b9b63f4d10ca07af9e0547a13dd69
>
> The following commit(s) were added to refs/heads/mast
On Fri, 27 Apr 2018 23:10:34 +1000 Joshua Root
wrote:
> On 2018-4-27 23:02 , Rainer Müller wrote:
> > On 2018-04-27 14:37, Perry E. Metzger wrote:
> >> "For the above operations provided by Tcl's file command,
> >> MacPorts provides the following shorthands. These should be used
> >> in preferen
On 2018-4-27 23:02 , Rainer Müller wrote:
> On 2018-04-27 14:37, Perry E. Metzger wrote:
>> "For the above operations provided by Tcl's file command, MacPorts
>> provides the following shorthands. These should be used in preference
>> to the Tcl commands above, as they may work around certain bugs.
On 2018-04-27 14:37, Perry E. Metzger wrote:
> "For the above operations provided by Tcl's file command, MacPorts
> provides the following shorthands. These should be used in preference
> to the Tcl commands above, as they may work around certain bugs."
Ah, I even linked to this section, but did n
I just replicated the scenario (create files in a git-ignored dir) and
switch between branches: files stayed put.
On 04/26/2018 09:46 PM, Ryan Schmidt wrote:
>
> On Apr 26, 2018, at 20:38, Michael wrote:
>
>> On 2018-04-26, at 5:01 PM, Ryan Schmidt wrote:
>>
>>> To do this, I was first required
On Fri, 27 Apr 2018 05:02:30 +0200 Rainer Müller
wrote:
> On 2018-04-27 03:23, Perry E. Metzger wrote:
> > In one part of the guide, we say not to use "file copy" but to use
> > "copy" instead,
>
> Are you sure you read that in the guide?
Yes.
"For the above operations provided by Tcl's file
29 matches
Mail list logo
