Recover the complicated situation after my bad merge

I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state

This commit is contained in:

Vladimír Čunát

2020-10-26 09:01:04 +01:00

parent 4bd836b381

commit 89023c38fc

52 changed files with 667 additions and 1750 deletions

									
										pkgs/development/libraries/p11-kit/default.nix
									
		+7
		
												View File
												
				@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {

				  enableParallelBuilding = true;

				  # Tests run in fakeroot for non-root users

				  preCheck = ''

				    if [ "$(id -u)" != "0" ]; then

				      export FAKED_MODE=1

				    fi

				  '';

				  doCheck = !stdenv.isDarwin;

				  installFlags = [