Guilt v0.29
[guilt.git] / regression / t-020.out
blobfee8c8be9a81edfddccc9db2220f2c31f29bcb30
1 % setup_repo
2 % guilt-push (unnamed, modify)
3 Applying patch..modify
4 Patch applied.
5 % list_files
6 d .git/patches
7 d .git/patches/master
8 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
9 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
10 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
11 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
12 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
13 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
14 % git-log
15 commit 33633e7a1aa31972f125878baf7807be57b1672d
16 Author: Author Name <author@email>
17 Date:   Mon Jan 1 00:00:00 2007 +0000
19     patch modify
21 diff --git a/def b/def
22 index 8baef1b..7d69c2f 100644
23 --- a/def
24 +++ b/def
25 @@ -1 +1,2 @@
26  abc
27 +asjhfksad
29 commit d4850419ccc1146c7169f500725ce504b9774ed0
30 Author: Author Name <author@email>
31 Date:   Mon Jan 1 00:00:00 2007 +0000
33     initial
34     
35     Signed-off-by: Commiter Name <commiter@email>
37 diff --git a/def b/def
38 new file mode 100644
39 index 0000000..8baef1b
40 --- /dev/null
41 +++ b/def
42 @@ -0,0 +1 @@
43 +abc
44 % guilt-push (unnamed, add)
45 Applying patch..add
46 Patch applied.
47 % list_files
48 d .git/patches
49 d .git/patches/master
50 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
51 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
52 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
53 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
54 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
55 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
56 % git-log
57 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
58 Author: Author Name <author@email>
59 Date:   Mon Jan 1 00:00:00 2007 +0000
61     patch add
63 diff --git a/abd b/abd
64 new file mode 100644
65 index 0000000..489450e
66 --- /dev/null
67 +++ b/abd
68 @@ -0,0 +1 @@
69 +qweert
71 commit 33633e7a1aa31972f125878baf7807be57b1672d
72 Author: Author Name <author@email>
73 Date:   Mon Jan 1 00:00:00 2007 +0000
75     patch modify
77 diff --git a/def b/def
78 index 8baef1b..7d69c2f 100644
79 --- a/def
80 +++ b/def
81 @@ -1 +1,2 @@
82  abc
83 +asjhfksad
85 commit d4850419ccc1146c7169f500725ce504b9774ed0
86 Author: Author Name <author@email>
87 Date:   Mon Jan 1 00:00:00 2007 +0000
89     initial
90     
91     Signed-off-by: Commiter Name <commiter@email>
93 diff --git a/def b/def
94 new file mode 100644
95 index 0000000..8baef1b
96 --- /dev/null
97 +++ b/def
98 @@ -0,0 +1 @@
99 +abc
100 % guilt-push (unnamed, remove)
101 Applying patch..remove
102 Patch applied.
103 % list_files
104 d .git/patches
105 d .git/patches/master
106 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
107 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
108 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
109 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
110 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
111 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
112 % git-log
113 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
114 Author: Author Name <author@email>
115 Date:   Mon Jan 1 00:00:00 2007 +0000
117     patch remove
119 diff --git a/abd b/abd
120 deleted file mode 100644
121 index 489450e..0000000
122 --- a/abd
123 +++ /dev/null
124 @@ -1 +0,0 @@
125 -qweert
127 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
128 Author: Author Name <author@email>
129 Date:   Mon Jan 1 00:00:00 2007 +0000
131     patch add
133 diff --git a/abd b/abd
134 new file mode 100644
135 index 0000000..489450e
136 --- /dev/null
137 +++ b/abd
138 @@ -0,0 +1 @@
139 +qweert
141 commit 33633e7a1aa31972f125878baf7807be57b1672d
142 Author: Author Name <author@email>
143 Date:   Mon Jan 1 00:00:00 2007 +0000
145     patch modify
147 diff --git a/def b/def
148 index 8baef1b..7d69c2f 100644
149 --- a/def
150 +++ b/def
151 @@ -1 +1,2 @@
152  abc
153 +asjhfksad
155 commit d4850419ccc1146c7169f500725ce504b9774ed0
156 Author: Author Name <author@email>
157 Date:   Mon Jan 1 00:00:00 2007 +0000
159     initial
160     
161     Signed-off-by: Commiter Name <commiter@email>
163 diff --git a/def b/def
164 new file mode 100644
165 index 0000000..8baef1b
166 --- /dev/null
167 +++ b/def
168 @@ -0,0 +1 @@
169 +abc
170 % guilt-push (unnamed, mode)
171 Applying patch..mode
172 Patch applied.
173 % list_files
174 d .git/patches
175 d .git/patches/master
176 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
177 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
178 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
179 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
180 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
181 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
182 % git-log
183 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
184 Author: Author Name <author@email>
185 Date:   Mon Jan 1 00:00:00 2007 +0000
187     patch mode
189 diff --git a/def b/def
190 old mode 100644
191 new mode 100755
193 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
194 Author: Author Name <author@email>
195 Date:   Mon Jan 1 00:00:00 2007 +0000
197     patch remove
199 diff --git a/abd b/abd
200 deleted file mode 100644
201 index 489450e..0000000
202 --- a/abd
203 +++ /dev/null
204 @@ -1 +0,0 @@
205 -qweert
207 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
208 Author: Author Name <author@email>
209 Date:   Mon Jan 1 00:00:00 2007 +0000
211     patch add
213 diff --git a/abd b/abd
214 new file mode 100644
215 index 0000000..489450e
216 --- /dev/null
217 +++ b/abd
218 @@ -0,0 +1 @@
219 +qweert
221 commit 33633e7a1aa31972f125878baf7807be57b1672d
222 Author: Author Name <author@email>
223 Date:   Mon Jan 1 00:00:00 2007 +0000
225     patch modify
227 diff --git a/def b/def
228 index 8baef1b..7d69c2f 100644
229 --- a/def
230 +++ b/def
231 @@ -1 +1,2 @@
232  abc
233 +asjhfksad
235 commit d4850419ccc1146c7169f500725ce504b9774ed0
236 Author: Author Name <author@email>
237 Date:   Mon Jan 1 00:00:00 2007 +0000
239     initial
240     
241     Signed-off-by: Commiter Name <commiter@email>
243 diff --git a/def b/def
244 new file mode 100644
245 index 0000000..8baef1b
246 --- /dev/null
247 +++ b/def
248 @@ -0,0 +1 @@
249 +abc
250 % guilt-pop --all
251 All patches popped.
252 % guilt-push modify (named, modify)
253 Applying patch..modify
254 Patch applied.
255 % list_files
256 d .git/patches
257 d .git/patches/master
258 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
259 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
260 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
261 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
262 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
263 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
264 % git-log
265 commit 33633e7a1aa31972f125878baf7807be57b1672d
266 Author: Author Name <author@email>
267 Date:   Mon Jan 1 00:00:00 2007 +0000
269     patch modify
271 diff --git a/def b/def
272 index 8baef1b..7d69c2f 100644
273 --- a/def
274 +++ b/def
275 @@ -1 +1,2 @@
276  abc
277 +asjhfksad
279 commit d4850419ccc1146c7169f500725ce504b9774ed0
280 Author: Author Name <author@email>
281 Date:   Mon Jan 1 00:00:00 2007 +0000
283     initial
284     
285     Signed-off-by: Commiter Name <commiter@email>
287 diff --git a/def b/def
288 new file mode 100644
289 index 0000000..8baef1b
290 --- /dev/null
291 +++ b/def
292 @@ -0,0 +1 @@
293 +abc
294 % guilt-pop --all
295 All patches popped.
296 % guilt-push add (named, add)
297 Applying patch..modify
298 Patch applied.
299 % list_files
300 d .git/patches
301 d .git/patches/master
302 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
303 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
304 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
305 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
306 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
307 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
308 % git-log
309 commit 33633e7a1aa31972f125878baf7807be57b1672d
310 Author: Author Name <author@email>
311 Date:   Mon Jan 1 00:00:00 2007 +0000
313     patch modify
315 diff --git a/def b/def
316 index 8baef1b..7d69c2f 100644
317 --- a/def
318 +++ b/def
319 @@ -1 +1,2 @@
320  abc
321 +asjhfksad
323 commit d4850419ccc1146c7169f500725ce504b9774ed0
324 Author: Author Name <author@email>
325 Date:   Mon Jan 1 00:00:00 2007 +0000
327     initial
328     
329     Signed-off-by: Commiter Name <commiter@email>
331 diff --git a/def b/def
332 new file mode 100644
333 index 0000000..8baef1b
334 --- /dev/null
335 +++ b/def
336 @@ -0,0 +1 @@
337 +abc
338 % guilt-pop --all
339 All patches popped.
340 % guilt-push remove (named, remove)
341 Applying patch..modify
342 Patch applied.
343 % list_files
344 d .git/patches
345 d .git/patches/master
346 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
347 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
348 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
349 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
350 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
351 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
352 % git-log
353 commit 33633e7a1aa31972f125878baf7807be57b1672d
354 Author: Author Name <author@email>
355 Date:   Mon Jan 1 00:00:00 2007 +0000
357     patch modify
359 diff --git a/def b/def
360 index 8baef1b..7d69c2f 100644
361 --- a/def
362 +++ b/def
363 @@ -1 +1,2 @@
364  abc
365 +asjhfksad
367 commit d4850419ccc1146c7169f500725ce504b9774ed0
368 Author: Author Name <author@email>
369 Date:   Mon Jan 1 00:00:00 2007 +0000
371     initial
372     
373     Signed-off-by: Commiter Name <commiter@email>
375 diff --git a/def b/def
376 new file mode 100644
377 index 0000000..8baef1b
378 --- /dev/null
379 +++ b/def
380 @@ -0,0 +1 @@
381 +abc
382 % guilt-pop --all
383 All patches popped.
384 % guilt-push mode (named, mode)
385 Applying patch..modify
386 Patch applied.
387 % list_files
388 d .git/patches
389 d .git/patches/master
390 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
391 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
392 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
393 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
394 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
395 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
396 % git-log
397 commit 33633e7a1aa31972f125878baf7807be57b1672d
398 Author: Author Name <author@email>
399 Date:   Mon Jan 1 00:00:00 2007 +0000
401     patch modify
403 diff --git a/def b/def
404 index 8baef1b..7d69c2f 100644
405 --- a/def
406 +++ b/def
407 @@ -1 +1,2 @@
408  abc
409 +asjhfksad
411 commit d4850419ccc1146c7169f500725ce504b9774ed0
412 Author: Author Name <author@email>
413 Date:   Mon Jan 1 00:00:00 2007 +0000
415     initial
416     
417     Signed-off-by: Commiter Name <commiter@email>
419 diff --git a/def b/def
420 new file mode 100644
421 index 0000000..8baef1b
422 --- /dev/null
423 +++ b/def
424 @@ -0,0 +1 @@
425 +abc
426 % guilt-pop --all
427 All patches popped.
428 % guilt-push modify (named, incremental, modify)
429 Applying patch..modify
430 Patch applied.
431 % list_files
432 d .git/patches
433 d .git/patches/master
434 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
435 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
436 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
437 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
438 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
439 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
440 % git-log
441 commit 33633e7a1aa31972f125878baf7807be57b1672d
442 Author: Author Name <author@email>
443 Date:   Mon Jan 1 00:00:00 2007 +0000
445     patch modify
447 diff --git a/def b/def
448 index 8baef1b..7d69c2f 100644
449 --- a/def
450 +++ b/def
451 @@ -1 +1,2 @@
452  abc
453 +asjhfksad
455 commit d4850419ccc1146c7169f500725ce504b9774ed0
456 Author: Author Name <author@email>
457 Date:   Mon Jan 1 00:00:00 2007 +0000
459     initial
460     
461     Signed-off-by: Commiter Name <commiter@email>
463 diff --git a/def b/def
464 new file mode 100644
465 index 0000000..8baef1b
466 --- /dev/null
467 +++ b/def
468 @@ -0,0 +1 @@
469 +abc
470 % guilt-push add (named, incremental, add)
471 Applying patch..add
472 Patch applied.
473 % list_files
474 d .git/patches
475 d .git/patches/master
476 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
477 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
478 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
479 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
480 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
481 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
482 % git-log
483 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
484 Author: Author Name <author@email>
485 Date:   Mon Jan 1 00:00:00 2007 +0000
487     patch add
489 diff --git a/abd b/abd
490 new file mode 100644
491 index 0000000..489450e
492 --- /dev/null
493 +++ b/abd
494 @@ -0,0 +1 @@
495 +qweert
497 commit 33633e7a1aa31972f125878baf7807be57b1672d
498 Author: Author Name <author@email>
499 Date:   Mon Jan 1 00:00:00 2007 +0000
501     patch modify
503 diff --git a/def b/def
504 index 8baef1b..7d69c2f 100644
505 --- a/def
506 +++ b/def
507 @@ -1 +1,2 @@
508  abc
509 +asjhfksad
511 commit d4850419ccc1146c7169f500725ce504b9774ed0
512 Author: Author Name <author@email>
513 Date:   Mon Jan 1 00:00:00 2007 +0000
515     initial
516     
517     Signed-off-by: Commiter Name <commiter@email>
519 diff --git a/def b/def
520 new file mode 100644
521 index 0000000..8baef1b
522 --- /dev/null
523 +++ b/def
524 @@ -0,0 +1 @@
525 +abc
526 % guilt-push remove (named, incremental, remove)
527 Applying patch..remove
528 Patch applied.
529 % list_files
530 d .git/patches
531 d .git/patches/master
532 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
533 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
534 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
535 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
536 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
537 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
538 % git-log
539 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
540 Author: Author Name <author@email>
541 Date:   Mon Jan 1 00:00:00 2007 +0000
543     patch remove
545 diff --git a/abd b/abd
546 deleted file mode 100644
547 index 489450e..0000000
548 --- a/abd
549 +++ /dev/null
550 @@ -1 +0,0 @@
551 -qweert
553 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
554 Author: Author Name <author@email>
555 Date:   Mon Jan 1 00:00:00 2007 +0000
557     patch add
559 diff --git a/abd b/abd
560 new file mode 100644
561 index 0000000..489450e
562 --- /dev/null
563 +++ b/abd
564 @@ -0,0 +1 @@
565 +qweert
567 commit 33633e7a1aa31972f125878baf7807be57b1672d
568 Author: Author Name <author@email>
569 Date:   Mon Jan 1 00:00:00 2007 +0000
571     patch modify
573 diff --git a/def b/def
574 index 8baef1b..7d69c2f 100644
575 --- a/def
576 +++ b/def
577 @@ -1 +1,2 @@
578  abc
579 +asjhfksad
581 commit d4850419ccc1146c7169f500725ce504b9774ed0
582 Author: Author Name <author@email>
583 Date:   Mon Jan 1 00:00:00 2007 +0000
585     initial
586     
587     Signed-off-by: Commiter Name <commiter@email>
589 diff --git a/def b/def
590 new file mode 100644
591 index 0000000..8baef1b
592 --- /dev/null
593 +++ b/def
594 @@ -0,0 +1 @@
595 +abc
596 % guilt-push mode (named, incremental, mode)
597 Applying patch..mode
598 Patch applied.
599 % list_files
600 d .git/patches
601 d .git/patches/master
602 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
603 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
604 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
605 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
606 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
607 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
608 % git-log
609 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
610 Author: Author Name <author@email>
611 Date:   Mon Jan 1 00:00:00 2007 +0000
613     patch mode
615 diff --git a/def b/def
616 old mode 100644
617 new mode 100755
619 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
620 Author: Author Name <author@email>
621 Date:   Mon Jan 1 00:00:00 2007 +0000
623     patch remove
625 diff --git a/abd b/abd
626 deleted file mode 100644
627 index 489450e..0000000
628 --- a/abd
629 +++ /dev/null
630 @@ -1 +0,0 @@
631 -qweert
633 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
634 Author: Author Name <author@email>
635 Date:   Mon Jan 1 00:00:00 2007 +0000
637     patch add
639 diff --git a/abd b/abd
640 new file mode 100644
641 index 0000000..489450e
642 --- /dev/null
643 +++ b/abd
644 @@ -0,0 +1 @@
645 +qweert
647 commit 33633e7a1aa31972f125878baf7807be57b1672d
648 Author: Author Name <author@email>
649 Date:   Mon Jan 1 00:00:00 2007 +0000
651     patch modify
653 diff --git a/def b/def
654 index 8baef1b..7d69c2f 100644
655 --- a/def
656 +++ b/def
657 @@ -1 +1,2 @@
658  abc
659 +asjhfksad
661 commit d4850419ccc1146c7169f500725ce504b9774ed0
662 Author: Author Name <author@email>
663 Date:   Mon Jan 1 00:00:00 2007 +0000
665     initial
666     
667     Signed-off-by: Commiter Name <commiter@email>
669 diff --git a/def b/def
670 new file mode 100644
671 index 0000000..8baef1b
672 --- /dev/null
673 +++ b/def
674 @@ -0,0 +1 @@
675 +abc
676 % guilt-pop --all
677 All patches popped.
678 % guilt-push -n -2
679 Invalid number of patches to push.
680 % list_files
681 d .git/patches
682 d .git/patches/master
683 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
684 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
685 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
686 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
687 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
688 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
689 % git-log
690 commit d4850419ccc1146c7169f500725ce504b9774ed0
691 Author: Author Name <author@email>
692 Date:   Mon Jan 1 00:00:00 2007 +0000
694     initial
695     
696     Signed-off-by: Commiter Name <commiter@email>
698 diff --git a/def b/def
699 new file mode 100644
700 index 0000000..8baef1b
701 --- /dev/null
702 +++ b/def
703 @@ -0,0 +1 @@
704 +abc
705 % guilt-pop --all
706 No patches applied.
707 % guilt-push -n -1
708 Invalid number of patches to push.
709 % list_files
710 d .git/patches
711 d .git/patches/master
712 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
713 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
714 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
715 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
716 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
717 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
718 % git-log
719 commit d4850419ccc1146c7169f500725ce504b9774ed0
720 Author: Author Name <author@email>
721 Date:   Mon Jan 1 00:00:00 2007 +0000
723     initial
724     
725     Signed-off-by: Commiter Name <commiter@email>
727 diff --git a/def b/def
728 new file mode 100644
729 index 0000000..8baef1b
730 --- /dev/null
731 +++ b/def
732 @@ -0,0 +1 @@
733 +abc
734 % guilt-pop --all
735 No patches applied.
736 % guilt-push -n 0
737 Applying patch..modify
738 Patch applied.
739 % list_files
740 d .git/patches
741 d .git/patches/master
742 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
743 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
744 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
745 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
746 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
747 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
748 % git-log
749 commit 33633e7a1aa31972f125878baf7807be57b1672d
750 Author: Author Name <author@email>
751 Date:   Mon Jan 1 00:00:00 2007 +0000
753     patch modify
755 diff --git a/def b/def
756 index 8baef1b..7d69c2f 100644
757 --- a/def
758 +++ b/def
759 @@ -1 +1,2 @@
760  abc
761 +asjhfksad
763 commit d4850419ccc1146c7169f500725ce504b9774ed0
764 Author: Author Name <author@email>
765 Date:   Mon Jan 1 00:00:00 2007 +0000
767     initial
768     
769     Signed-off-by: Commiter Name <commiter@email>
771 diff --git a/def b/def
772 new file mode 100644
773 index 0000000..8baef1b
774 --- /dev/null
775 +++ b/def
776 @@ -0,0 +1 @@
777 +abc
778 % guilt-pop --all
779 All patches popped.
780 % guilt-push -n 1
781 Applying patch..modify
782 Patch applied.
783 % list_files
784 d .git/patches
785 d .git/patches/master
786 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
787 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
788 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
789 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
790 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
791 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
792 % git-log
793 commit 33633e7a1aa31972f125878baf7807be57b1672d
794 Author: Author Name <author@email>
795 Date:   Mon Jan 1 00:00:00 2007 +0000
797     patch modify
799 diff --git a/def b/def
800 index 8baef1b..7d69c2f 100644
801 --- a/def
802 +++ b/def
803 @@ -1 +1,2 @@
804  abc
805 +asjhfksad
807 commit d4850419ccc1146c7169f500725ce504b9774ed0
808 Author: Author Name <author@email>
809 Date:   Mon Jan 1 00:00:00 2007 +0000
811     initial
812     
813     Signed-off-by: Commiter Name <commiter@email>
815 diff --git a/def b/def
816 new file mode 100644
817 index 0000000..8baef1b
818 --- /dev/null
819 +++ b/def
820 @@ -0,0 +1 @@
821 +abc
822 % guilt-pop --all
823 All patches popped.
824 % guilt-push -n 2
825 Applying patch..modify
826 Patch applied.
827 Applying patch..add
828 Patch applied.
829 % list_files
830 d .git/patches
831 d .git/patches/master
832 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
833 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
834 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
835 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
836 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
837 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
838 % git-log
839 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
840 Author: Author Name <author@email>
841 Date:   Mon Jan 1 00:00:00 2007 +0000
843     patch add
845 diff --git a/abd b/abd
846 new file mode 100644
847 index 0000000..489450e
848 --- /dev/null
849 +++ b/abd
850 @@ -0,0 +1 @@
851 +qweert
853 commit 33633e7a1aa31972f125878baf7807be57b1672d
854 Author: Author Name <author@email>
855 Date:   Mon Jan 1 00:00:00 2007 +0000
857     patch modify
859 diff --git a/def b/def
860 index 8baef1b..7d69c2f 100644
861 --- a/def
862 +++ b/def
863 @@ -1 +1,2 @@
864  abc
865 +asjhfksad
867 commit d4850419ccc1146c7169f500725ce504b9774ed0
868 Author: Author Name <author@email>
869 Date:   Mon Jan 1 00:00:00 2007 +0000
871     initial
872     
873     Signed-off-by: Commiter Name <commiter@email>
875 diff --git a/def b/def
876 new file mode 100644
877 index 0000000..8baef1b
878 --- /dev/null
879 +++ b/def
880 @@ -0,0 +1 @@
881 +abc
882 % guilt-pop --all
883 All patches popped.
884 % guilt-push -n 3
885 Applying patch..modify
886 Patch applied.
887 Applying patch..add
888 Patch applied.
889 Applying patch..remove
890 Patch applied.
891 % list_files
892 d .git/patches
893 d .git/patches/master
894 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
895 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
896 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
897 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
898 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
899 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
900 % git-log
901 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
902 Author: Author Name <author@email>
903 Date:   Mon Jan 1 00:00:00 2007 +0000
905     patch remove
907 diff --git a/abd b/abd
908 deleted file mode 100644
909 index 489450e..0000000
910 --- a/abd
911 +++ /dev/null
912 @@ -1 +0,0 @@
913 -qweert
915 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
916 Author: Author Name <author@email>
917 Date:   Mon Jan 1 00:00:00 2007 +0000
919     patch add
921 diff --git a/abd b/abd
922 new file mode 100644
923 index 0000000..489450e
924 --- /dev/null
925 +++ b/abd
926 @@ -0,0 +1 @@
927 +qweert
929 commit 33633e7a1aa31972f125878baf7807be57b1672d
930 Author: Author Name <author@email>
931 Date:   Mon Jan 1 00:00:00 2007 +0000
933     patch modify
935 diff --git a/def b/def
936 index 8baef1b..7d69c2f 100644
937 --- a/def
938 +++ b/def
939 @@ -1 +1,2 @@
940  abc
941 +asjhfksad
943 commit d4850419ccc1146c7169f500725ce504b9774ed0
944 Author: Author Name <author@email>
945 Date:   Mon Jan 1 00:00:00 2007 +0000
947     initial
948     
949     Signed-off-by: Commiter Name <commiter@email>
951 diff --git a/def b/def
952 new file mode 100644
953 index 0000000..8baef1b
954 --- /dev/null
955 +++ b/def
956 @@ -0,0 +1 @@
957 +abc
958 % guilt-pop --all
959 All patches popped.
960 % guilt-push -n 4
961 Applying patch..modify
962 Patch applied.
963 Applying patch..add
964 Patch applied.
965 Applying patch..remove
966 Patch applied.
967 Applying patch..mode
968 Patch applied.
969 % list_files
970 d .git/patches
971 d .git/patches/master
972 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
973 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
974 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
975 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
976 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
977 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
978 % git-log
979 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
980 Author: Author Name <author@email>
981 Date:   Mon Jan 1 00:00:00 2007 +0000
983     patch mode
985 diff --git a/def b/def
986 old mode 100644
987 new mode 100755
989 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
990 Author: Author Name <author@email>
991 Date:   Mon Jan 1 00:00:00 2007 +0000
993     patch remove
995 diff --git a/abd b/abd
996 deleted file mode 100644
997 index 489450e..0000000
998 --- a/abd
999 +++ /dev/null
1000 @@ -1 +0,0 @@
1001 -qweert
1003 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
1004 Author: Author Name <author@email>
1005 Date:   Mon Jan 1 00:00:00 2007 +0000
1007     patch add
1009 diff --git a/abd b/abd
1010 new file mode 100644
1011 index 0000000..489450e
1012 --- /dev/null
1013 +++ b/abd
1014 @@ -0,0 +1 @@
1015 +qweert
1017 commit 33633e7a1aa31972f125878baf7807be57b1672d
1018 Author: Author Name <author@email>
1019 Date:   Mon Jan 1 00:00:00 2007 +0000
1021     patch modify
1023 diff --git a/def b/def
1024 index 8baef1b..7d69c2f 100644
1025 --- a/def
1026 +++ b/def
1027 @@ -1 +1,2 @@
1028  abc
1029 +asjhfksad
1031 commit d4850419ccc1146c7169f500725ce504b9774ed0
1032 Author: Author Name <author@email>
1033 Date:   Mon Jan 1 00:00:00 2007 +0000
1035     initial
1036     
1037     Signed-off-by: Commiter Name <commiter@email>
1039 diff --git a/def b/def
1040 new file mode 100644
1041 index 0000000..8baef1b
1042 --- /dev/null
1043 +++ b/def
1044 @@ -0,0 +1 @@
1045 +abc
1046 % guilt-pop --all
1047 All patches popped.
1048 % list_files
1049 d .git/patches
1050 d .git/patches/master
1051 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1052 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1053 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1054 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1055 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1056 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status