screen: Update version from 4.5.0 to 4.5.1

[donald]

Fixes: #277

[pmenzel]

You need to rebase, as currently version 4.0.3 is specified in the branch, or merge manually. Please go ahead with that.

Tested on keineahnung.

[pmenzel]

git seems to think keepassx.be0 and screen.be0 are related, because they share a lot of code due to the standard template.

$ git merge origin/update-screen-from-4.0.3-to-4.5.1
Auto-merging keepassx.be0
CONFLICT (content): Merge conflict in keepassx.be0
Automatic merge failed; fix conflicts and then commit the result.
$ git diff
diff --cc keepassx.be0
index 3d89a13,09e4641..0000000
--- a/keepassx.be0
+++ b/keepassx.be0
@@@ -1,6 -1,6 +1,10 @@@
  #!/usr/bin/env beesh

++<<<<<<< HEAD:keepassx.be0
 +# BEE_VERSION keepassx-2.0.3-0
++=======
+ # BEE_VERSION screen-4.5.1-0
++>>>>>>> origin/update-screen-from-4.0.3-to-4.5.1:screen.be0

  ## this file was created by bee init and should be executed to build a
  ## bee-package. (Additional hints are located at the end of this file.)

Though it still a bug as the download URL differs. So, a great bug in git’s copy detection?

MarIuX64 still uses git 2.4.1.

[pmenzel]

… but the one from GitHub should be newer.

[donald]

The default rename threshold is 50%. When rename heuristic is disabled, the underlying conflict becomes visible:

buczek@theinternet:~/git/bee-files (master)$ git merge -Xrename-threshold=100% update-screen-from-4.0.3-to-4.5.1 
CONFLICT (modify/delete): screen.be0 deleted in HEAD and modified in update-screen-from-4.0.3-to-4.5.1. Version update-screen-from-4.0.3-to-4.5.1 of screen.be0 left in tree.
Automatic merge failed; fix conflicts and then commit the result.
buczek@theinternet:~/git/bee-files (master|MERGING)$ 

The update-screen-from-4.0.3-to-4.5.1 branch modified screen.be0 and the master deleted screen.be0, this is the conflict. Then git tried to guess whether the deletion actually was a rename and used its "if 50% are identical" heuristic on all newly created files. It used its first (or best?) match and keepassx.be0 became the random victim.

Resolved by

buczek@theinternet:~/git/bee-files (master|MERGING)$ git add screen.be0
buczek@theinternet:~/git/bee-files (master|MERGING)$ git commit