Guilt v0.37-rc1
[guilt.git] / regression / t-033.out
blob1ed371f801da05eca4bc61a942dd2187db610b05
1 % setup_repo
2 % guilt graph
3 No patch applied.
4 %% Testing branch a,graph
5 % git checkout -b a,graph master
6 Switched to a new branch 'a,graph'
7 % guilt init
8 % guilt new a.patch
9 % guilt pop
10 All patches popped.
11 % guilt push
12 Applying patch..a.patch
13 Patch applied.
14 % guilt graph
15 digraph G {
16 # checking rev 95275d7c05c6a6176d3941374115b91272877f6c
17         "95275d7c05c6a6176d3941374115b91272877f6c" [label="a.patch"]
19 % git add file.txt
20 % guilt refresh
21 Patch a.patch refreshed
22 % guilt pop
23 All patches popped.
24 % guilt push
25 Applying patch..a.patch
26 Patch applied.
27 % guilt graph
28 digraph G {
29 # checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
30         "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
32 %% Adding an unrelated file in a new patch. No deps.
33 % guilt new b.patch
34 % git add file2.txt
35 % guilt refresh
36 Patch b.patch refreshed
37 % guilt pop
38 Now at a.patch.
39 % guilt push
40 Applying patch..b.patch
41 Patch applied.
42 % guilt graph
43 digraph G {
44 # checking rev c7014443c33d2b0237293687ceb9cbd38313df65
45         "c7014443c33d2b0237293687ceb9cbd38313df65" [label="b.patch"]
46 # checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
47         "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
49 %% Changing a file already changed in the first patch adds a dependency.
50 % guilt new c.patch
51 % git add file.txt
52 % guilt refresh
53 Patch c.patch refreshed
54 % guilt pop
55 Now at b.patch.
56 % guilt push
57 Applying patch..c.patch
58 Patch applied.
59 % guilt graph
60 digraph G {
61 # checking rev 891bc14b5603474c9743fd04f3da888644413dc5
62         "891bc14b5603474c9743fd04f3da888644413dc5" [label="c.patch"]
63 # checking rev c7014443c33d2b0237293687ceb9cbd38313df65
64         "c7014443c33d2b0237293687ceb9cbd38313df65" [label="b.patch"]
65 # checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
66         "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
67         "891bc14b5603474c9743fd04f3da888644413dc5" -> "ff2775f8d1dc753f635830adcc3a067e0b681e2d"; // ?
69 % guilt new a-"better&quicker'-patch.patch
70 % git add file.txt
71 % guilt refresh
72 Patch a-"better&quicker'-patch.patch refreshed
73 % guilt pop
74 Now at c.patch.
75 % guilt push
76 Applying patch..a-"better&quicker'-patch.patch
77 Patch applied.
78 % guilt graph
79 digraph G {
80 # checking rev bc7df666a646739eaf559af23cab72f2bfd01f0e
81         "bc7df666a646739eaf559af23cab72f2bfd01f0e" [label="a-\"better&quicker'-patch.patch"]
82 # checking rev 891bc14b5603474c9743fd04f3da888644413dc5
83         "891bc14b5603474c9743fd04f3da888644413dc5" [label="c.patch"]
84         "bc7df666a646739eaf559af23cab72f2bfd01f0e" -> "891bc14b5603474c9743fd04f3da888644413dc5"; // ?
85 # checking rev c7014443c33d2b0237293687ceb9cbd38313df65
86         "c7014443c33d2b0237293687ceb9cbd38313df65" [label="b.patch"]
87 # checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
88         "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
89         "891bc14b5603474c9743fd04f3da888644413dc5" -> "ff2775f8d1dc753f635830adcc3a067e0b681e2d"; // ?
91 %% The same graph, but excluding deps introduced by file.txt.
92 % guilt graph -x file.txt
93 digraph G {
94 # checking rev bc7df666a646739eaf559af23cab72f2bfd01f0e
95         "bc7df666a646739eaf559af23cab72f2bfd01f0e" [label="a-\"better&quicker'-patch.patch"]
96 # checking rev 891bc14b5603474c9743fd04f3da888644413dc5
97         "891bc14b5603474c9743fd04f3da888644413dc5" [label="c.patch"]
98 # checking rev c7014443c33d2b0237293687ceb9cbd38313df65
99         "c7014443c33d2b0237293687ceb9cbd38313df65" [label="b.patch"]
100 # checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
101         "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]