repair: allow status file upgrade
[guilt.git] / regression / t-029.out
blobc92d4f2b680b4ae957337ff70ae39d66a953fba1
1 % setup_repo
2 % guilt-push -a
3 Applying patch..modify
4 Patch applied.
5 Applying patch..add
6 Patch applied.
7 Applying patch..remove
8 Patch applied.
9 Applying patch..mode
10 Patch applied.
11 % list_files
12 d .git/patches
13 d .git/patches/master
14 d .git/refs/patches
15 d .git/refs/patches/master
16 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
17 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
18 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
19 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
20 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
21 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
22 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
23 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
24 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
25 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
26 % guilt-repair
27 Please read the man page first. (you need to specify repair mode to proceed).
28 % list_files
29 d .git/patches
30 d .git/patches/master
31 d .git/refs/patches
32 d .git/refs/patches/master
33 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
34 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
35 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
36 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
37 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
38 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
39 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
40 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
41 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
42 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
43 % guilt-repair --full (answer: empty)
44 Checking status file format...ok; no upgrade necessary.
45 Current  HEAD commit 632ca0f5ec27a961990b45673dfc751f1da830f3
46 New      HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0
47 About to forcefully pop all patches...
48 Are you sure you want to proceed? [y/N] Aborting...
49 % list_files
50 d .git/patches
51 d .git/patches/master
52 d .git/refs/patches
53 d .git/refs/patches/master
54 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
55 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
56 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
57 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
58 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
59 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
60 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
61 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
62 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
63 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
64 % guilt-repair --full (answer: n)
65 Checking status file format...ok; no upgrade necessary.
66 Current  HEAD commit 632ca0f5ec27a961990b45673dfc751f1da830f3
67 New      HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0
68 About to forcefully pop all patches...
69 Are you sure you want to proceed? [y/N] Aborting...
70 % list_files
71 d .git/patches
72 d .git/patches/master
73 d .git/refs/patches
74 d .git/refs/patches/master
75 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
76 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
77 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
78 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
79 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
80 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
81 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
82 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
83 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
84 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
85 % guilt-repair --full (answer: y)
86 Checking status file format...ok; no upgrade necessary.
87 Current  HEAD commit 632ca0f5ec27a961990b45673dfc751f1da830f3
88 New      HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0
89 About to forcefully pop all patches...
90 Are you sure you want to proceed? [y/N] Patches should be popped.
91 Repair complete.
92 % list_files
93 d .git/patches
94 d .git/patches/master
95 d .git/refs/patches
96 d .git/refs/patches/master
97 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
98 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
99 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
100 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
101 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
102 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
103 % guilt-push -a
104 Applying patch..modify
105 Patch applied.
106 Applying patch..add
107 Patch applied.
108 Applying patch..remove
109 Patch applied.
110 Applying patch..mode
111 Patch applied.
112 % list_files
113 d .git/patches
114 d .git/patches/master
115 d .git/refs/patches
116 d .git/refs/patches/master
117 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
118 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
119 f 71596bf71b72c2717e1aee378aabefbfa19ab7c8  .git/patches/master/status
120 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
121 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
122 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
123 r 33633e7a1aa31972f125878baf7807be57b1672d  .git/refs/patches/master/modify
124 r 632ca0f5ec27a961990b45673dfc751f1da830f3  .git/refs/patches/master/mode
125 r 68f33a015dcfd09c3896f15d152378b54eaa4eb6  .git/refs/patches/master/add
126 r e67345cf1e7e9594c73efad7381a994f1fe63b14  .git/refs/patches/master/remove
127 % guilt-repair --full (answer: Y)
128 Checking status file format...ok; no upgrade necessary.
129 Current  HEAD commit 632ca0f5ec27a961990b45673dfc751f1da830f3
130 New      HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0
131 About to forcefully pop all patches...
132 Are you sure you want to proceed? [y/N] Patches should be popped.
133 Repair complete.
134 % list_files
135 d .git/patches
136 d .git/patches/master
137 d .git/refs/patches
138 d .git/refs/patches/master
139 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
140 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
141 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
142 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
143 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
144 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status