commit 4ff78b1187d0fbfdf5e46459365978761e954ca7 parent 1584b31e032304131fce0d309452ab73238b35cf Author: Thomas Frössman <thomasf@jossystem.se> Date: Mon, 4 Nov 2019 18:59:02 +0100 dev: have a repo ready that always generates the same merges it's easier to test... Diffstat:
15 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile @@ -38,3 +38,10 @@ test: elpa dev: clean elpa $(MAKE) ARGS="minimal-init/test-files/* minimal-init/init.el *-theme.el solarized.el" run + +dev-merge: clean elpa + rm -rf minimal-init/test-repo + git clone minimal-init/test.git minimal-init/test-repo + git -C minimal-init/test-repo checkout v2 + git -C minimal-init/test-repo merge origin/v1 || exit 0 + $(MAKE) ARGS="minimal-init/init.el *-theme.el solarized.el minimal-init/test-repo" run diff --git a/minimal-init/create-merge-conflict-repo.sh b/minimal-init/create-merge-conflict-repo.sh @@ -3,8 +3,7 @@ set -e set -x -rm -rf test-repo -mkdir -p test-repo +mkdir test-repo cd test-repo git init . touch HELLO @@ -36,8 +35,3 @@ git checkout v3 get_files v3.8.0 git checkout master git checkout v2 -git worktree add v3 v3 -git worktree add v1 v1 -(diff v1/inspect.py inspect.py > inspect_v1-v2.diff) || true -git merge v3 || true -git diff --color | cat diff --git a/minimal-init/init.el b/minimal-init/init.el @@ -32,10 +32,12 @@ display-buffer-same-window))) enable-local-variables nil web-mode-enable-engine-detection t - ediff-window-setup-function 'ediff-setup-windows-plain - ediff-diff-options "-w" + ediff-make-buffers-readonly-at-startup nil + ediff-diff-options "" magit-diff-refine-hunk 'all - ;;ediff-merge-split-window-function ediff-split-window-function + magit-diff-refine-ignore-whitespace nil + ediff-window-setup-function 'ediff-setup-windows-plain + ;; ) (require 'subr-x) @@ -64,7 +66,9 @@ package-user-dir (expand-file-name "elpa" init-dir) package-archives '(("gnu" . "https://elpa.gnu.org/packages/") ("melpa" . "https://melpa.org/packages/"))))) - +(defun dev-open-merge() + (interactive) + (find-file (expand-file-name "minimal-init/test-repo/" dev-project-root))) (defun dev-themes () "get list of all themes" diff --git a/minimal-init/test.git/HEAD b/minimal-init/test.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/v2 diff --git a/minimal-init/test.git/config b/minimal-init/test.git/config @@ -0,0 +1,6 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = /home/thomasf/src/github.com/bbatsov/solarized-emacs/minimal-init/test-repo diff --git a/minimal-init/test.git/description b/minimal-init/test.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/minimal-init/test.git/info/exclude b/minimal-init/test.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/minimal-init/test.git/info/refs b/minimal-init/test.git/info/refs @@ -0,0 +1,4 @@ +d5354b2a2fcd00fd0fc2685aaa986c3fbe62b621 refs/heads/master +679a64989e3cc66d178f3f38a370f2adce1b2322 refs/heads/v1 +f7ddcd2f2a519f3713a63232694bf558dc585ecb refs/heads/v2 +c4c9cd52989a40b918cc8bfe9307ba5c25abecce refs/heads/v3 diff --git a/minimal-init/test.git/objects/02/7812ca9f6c73f14c612ea79b5fe8163b3101ba b/minimal-init/test.git/objects/02/7812ca9f6c73f14c612ea79b5fe8163b3101ba Binary files differ. diff --git a/minimal-init/test.git/objects/de/8281fd3c7b63686a3554125d1983851027f01b b/minimal-init/test.git/objects/de/8281fd3c7b63686a3554125d1983851027f01b Binary files differ. diff --git a/minimal-init/test.git/objects/info/packs b/minimal-init/test.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.pack + diff --git a/minimal-init/test.git/objects/pack/pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.bitmap b/minimal-init/test.git/objects/pack/pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.bitmap Binary files differ. diff --git a/minimal-init/test.git/objects/pack/pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.idx b/minimal-init/test.git/objects/pack/pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.idx Binary files differ. diff --git a/minimal-init/test.git/objects/pack/pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.pack b/minimal-init/test.git/objects/pack/pack-a610aeb18a8502fe396671813f6bf9d6e1d28b57.pack Binary files differ. diff --git a/minimal-init/test.git/packed-refs b/minimal-init/test.git/packed-refs @@ -0,0 +1,5 @@ +# pack-refs with: peeled fully-peeled sorted +d5354b2a2fcd00fd0fc2685aaa986c3fbe62b621 refs/heads/master +679a64989e3cc66d178f3f38a370f2adce1b2322 refs/heads/v1 +f7ddcd2f2a519f3713a63232694bf558dc585ecb refs/heads/v2 +c4c9cd52989a40b918cc8bfe9307ba5c25abecce refs/heads/v3