Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kdiff3: fix with git mergetool #25059

Merged
merged 1 commit into from Apr 20, 2017
Merged

kdiff3: fix with git mergetool #25059

merged 1 commit into from Apr 20, 2017

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Apr 20, 2017

Without this the default git mergetool hook is unusable; it worked fine until KF5. The quick patch has been submitted upstream: https://gitlab.com/tfischer/kdiff3/merge_requests/2

/cc nixpkgs maintainers @viric, @peterhoeg.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change (none exist).
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vcunat
kdiff3: fix with git mergetool
be7ce1b 
The quick patch has been submitted upstream.
@vcunat vcunat added 0.kind: regression Something that worked before working no longer 9.needs: community feedback 9.needs: port to stable A PR needs a backport to the stable release. labels Apr 20, 2017
@mention-bot
Copy link

@vcunat, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ttuegel, @7c6f434c and @urkud to be potential reviewers.

@peterhoeg
Copy link
Member

I've only used kdiff3 for diffing - never to actually merge anything so thanks for spotting and fixing this! 👍

@7c6f434c 7c6f434c merged commit 3893332 into NixOS:master Apr 20, 2017
@vcunat vcunat deleted the p/kdiff3-git-mergetool branch April 20, 2017 15:15
vcunat added a commit that referenced this pull request Apr 20, 2017
@vcunat
kdiff3: fix with git mergetool (#25059)
c558d09 
The quick patch has been submitted upstream.

(cherry picked from commit be7ce1b)
I consider that problem a regression wrt. 16.09.
@vcunat vcunat removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 20, 2017
vcunat added a commit that referenced this pull request Apr 22, 2017
@vcunat
kdiff3: fixup patch hash after #25059
4fe9cf7 
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.

(cherry picked from commit b72d4e1)
vcunat added a commit that referenced this pull request Apr 22, 2017
@vcunat
kdiff3: fixup patch hash after #25059
b72d4e1 
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
vcunat added a commit that referenced this pull request Apr 23, 2017
@vcunat
Revert "kdiff3: fixup patch hash after #25059"
5a3e454 
This reverts commit b72d4e1.
The problem was fixed by the parent commit.
vcunat added a commit that referenced this pull request Apr 23, 2017
@vcunat
Revert "kdiff3: fixup patch hash after #25059"
e9360f2 
This reverts commit b72d4e1.
(cherry picked from commit 5a3e454)
The hash was actually fine, but Hydra re-used the bad derivation from
master.  Nondeterministic fixed-output derivations are hell.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
0.kind: regression Something that worked before working no longer 9.needs: community feedback
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@vcunat @mention-bot @peterhoeg @7c6f434c