On Fri, 27 Apr 2018 23:58:41 -0400 "Helmut K. C. Tessarek"
wrote:
> Just as a reference, the fastest way to do it:
>
> git revert --no-commit ad74231453^..24864aeda9
The ^ there is key, and easy not to notice. My main problem while
fixing this was trying very hard not to encounter a fencepost er
Hello Marcus,
On 2018-04-28 01:33, 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 chan
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
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 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
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
13 matches
Mail list logo
