zsh-workers
 help / color / mirror / code / Atom feed
cb4ea4f589a38cb88b8ed7dede248bf45f3b7787 blob 1368 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
 
#!/usr/local/bin/zsh -f
#
# This script creates a test repository for testing the git backend's behaviour during rebase-apply operations.
#
# It works in ./vcs-test/.
#
# Suggested zshrc settings:
#
#     autoload vcs_info
#     precmd() { vcs_info; typeset -pm vcs\* }
#     zstyle ':vcs_info:*' actionformats %m
#     zstyle ':vcs_info:*' patch-format '[%n+%c=%a] [%p] [%u]'
#     zstyle :vcs_info:\*gen-applied-string\* hooks f1
#     +vi-f1() { typeset -p argv hook_com }
#     zstyle :vcs_info:\*gen-unapplied-string\* hooks f2
#     +vi-f2() { typeset -p argv hook_com }
#     zstyle :vcs_info:\* get-unapplied true
#
mkdir "vcs-test"
cd "vcs-test"
git init

append_lines() { for 1; do echo line from r$1 >> iota && git commit -am "r$1: Append a line"; done }

echo "This is the file 'iota'." > iota
git add iota
git commit -m "r1: Add iota"
git tag rebase_onto_this HEAD

# Make another change to iota
append_lines 2
git tag rebase_from_this HEAD

# Make non-conflicting changes
for 1 in 3 4 5 6; do
    touch kappa$1
    git add kappa$1
    git commit -m "r${1}: non-conflicting change"
done

# Make more changes to iota
append_lines 7 8 9

# Specify a rebase that would create the history [1,3,4,5,6,7,8,9].
# This will conflict because r7 depends on r2 which is not included.
git checkout -b myref
git rebase --onto=rebase_onto_this rebase_from_this myref


debug log:

solving cb4ea4f58 ...
found cb4ea4f58 in https://git.vuxu.org/mirror/zsh/

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).