regression/t-021.out

   1 % setup_repo
   2 % guilt-push --all
   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 % git-log
  12 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
  13 Author: Author Name <author@email>
  14 Date:   Mon Jan 1 00:00:00 2007 +0000
  15
  16     patch mode
  17
  18 diff --git a/def b/def
  19 old mode 100644
  20 new mode 100755
  21
  22 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
  23 Author: Author Name <author@email>
  24 Date:   Mon Jan 1 00:00:00 2007 +0000
  25
  26     patch remove
  27
  28 diff --git a/abd b/abd
  29 deleted file mode 100644
  30 index 489450e..0000000
  31 --- a/abd
  32 +++ /dev/null
  33 @@ -1 +0,0 @@
  34 -qweert
  35
  36 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
  37 Author: Author Name <author@email>
  38 Date:   Mon Jan 1 00:00:00 2007 +0000
  39
  40     patch add
  41
  42 diff --git a/abd b/abd
  43 new file mode 100644
  44 index 0000000..489450e
  45 --- /dev/null
  46 +++ b/abd
  47 @@ -0,0 +1 @@
  48 +qweert
  49
  50 commit 33633e7a1aa31972f125878baf7807be57b1672d
  51 Author: Author Name <author@email>
  52 Date:   Mon Jan 1 00:00:00 2007 +0000
  53
  54     patch modify
  55
  56 diff --git a/def b/def
  57 index 8baef1b..7d69c2f 100644
  58 --- a/def
  59 +++ b/def
  60 @@ -1 +1,2 @@
  61  abc
  62 +asjhfksad
  63
  64 commit d4850419ccc1146c7169f500725ce504b9774ed0
  65 Author: Author Name <author@email>
  66 Date:   Mon Jan 1 00:00:00 2007 +0000
  67
  68     initial
  69
  70     Signed-off-by: Commiter Name <commiter@email>
  71
  72 diff --git a/def b/def
  73 new file mode 100644
  74 index 0000000..8baef1b
  75 --- /dev/null
  76 +++ b/def
  77 @@ -0,0 +1 @@
  78 +abc
  79 % guilt-pop (unnamed, mode)
  80 Now at remove.
  81 % list_files
  82 d .git/patches
  83 d .git/patches/master
  84 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
  85 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
  86 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
  87 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
  88 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
  89 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
  90 % git-log
  91 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
  92 Author: Author Name <author@email>
  93 Date:   Mon Jan 1 00:00:00 2007 +0000
  94
  95     patch remove
  96
  97 diff --git a/abd b/abd
  98 deleted file mode 100644
  99 index 489450e..0000000
 100 --- a/abd
 101 +++ /dev/null
 102 @@ -1 +0,0 @@
 103 -qweert
 104
 105 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 106 Author: Author Name <author@email>
 107 Date:   Mon Jan 1 00:00:00 2007 +0000
 108
 109     patch add
 110
 111 diff --git a/abd b/abd
 112 new file mode 100644
 113 index 0000000..489450e
 114 --- /dev/null
 115 +++ b/abd
 116 @@ -0,0 +1 @@
 117 +qweert
 118
 119 commit 33633e7a1aa31972f125878baf7807be57b1672d
 120 Author: Author Name <author@email>
 121 Date:   Mon Jan 1 00:00:00 2007 +0000
 122
 123     patch modify
 124
 125 diff --git a/def b/def
 126 index 8baef1b..7d69c2f 100644
 127 --- a/def
 128 +++ b/def
 129 @@ -1 +1,2 @@
 130  abc
 131 +asjhfksad
 132
 133 commit d4850419ccc1146c7169f500725ce504b9774ed0
 134 Author: Author Name <author@email>
 135 Date:   Mon Jan 1 00:00:00 2007 +0000
 136
 137     initial
 138
 139     Signed-off-by: Commiter Name <commiter@email>
 140
 141 diff --git a/def b/def
 142 new file mode 100644
 143 index 0000000..8baef1b
 144 --- /dev/null
 145 +++ b/def
 146 @@ -0,0 +1 @@
 147 +abc
 148 % guilt-pop (unnamed, remove)
 149 Now at add.
 150 % list_files
 151 d .git/patches
 152 d .git/patches/master
 153 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 154 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 155 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 156 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 157 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 158 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
 159 % git-log
 160 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 161 Author: Author Name <author@email>
 162 Date:   Mon Jan 1 00:00:00 2007 +0000
 163
 164     patch add
 165
 166 diff --git a/abd b/abd
 167 new file mode 100644
 168 index 0000000..489450e
 169 --- /dev/null
 170 +++ b/abd
 171 @@ -0,0 +1 @@
 172 +qweert
 173
 174 commit 33633e7a1aa31972f125878baf7807be57b1672d
 175 Author: Author Name <author@email>
 176 Date:   Mon Jan 1 00:00:00 2007 +0000
 177
 178     patch modify
 179
 180 diff --git a/def b/def
 181 index 8baef1b..7d69c2f 100644
 182 --- a/def
 183 +++ b/def
 184 @@ -1 +1,2 @@
 185  abc
 186 +asjhfksad
 187
 188 commit d4850419ccc1146c7169f500725ce504b9774ed0
 189 Author: Author Name <author@email>
 190 Date:   Mon Jan 1 00:00:00 2007 +0000
 191
 192     initial
 193
 194     Signed-off-by: Commiter Name <commiter@email>
 195
 196 diff --git a/def b/def
 197 new file mode 100644
 198 index 0000000..8baef1b
 199 --- /dev/null
 200 +++ b/def
 201 @@ -0,0 +1 @@
 202 +abc
 203 % guilt-pop (unnamed, add)
 204 Now at modify.
 205 % list_files
 206 d .git/patches
 207 d .git/patches/master
 208 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 209 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 210 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 211 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
 212 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 213 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 214 % git-log
 215 commit 33633e7a1aa31972f125878baf7807be57b1672d
 216 Author: Author Name <author@email>
 217 Date:   Mon Jan 1 00:00:00 2007 +0000
 218
 219     patch modify
 220
 221 diff --git a/def b/def
 222 index 8baef1b..7d69c2f 100644
 223 --- a/def
 224 +++ b/def
 225 @@ -1 +1,2 @@
 226  abc
 227 +asjhfksad
 228
 229 commit d4850419ccc1146c7169f500725ce504b9774ed0
 230 Author: Author Name <author@email>
 231 Date:   Mon Jan 1 00:00:00 2007 +0000
 232
 233     initial
 234
 235     Signed-off-by: Commiter Name <commiter@email>
 236
 237 diff --git a/def b/def
 238 new file mode 100644
 239 index 0000000..8baef1b
 240 --- /dev/null
 241 +++ b/def
 242 @@ -0,0 +1 @@
 243 +abc
 244 % guilt-pop (unnamed, modify)
 245 All patches popped.
 246 % list_files
 247 d .git/patches
 248 d .git/patches/master
 249 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 250 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 251 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 252 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 253 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 254 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
 255 % git-log
 256 commit d4850419ccc1146c7169f500725ce504b9774ed0
 257 Author: Author Name <author@email>
 258 Date:   Mon Jan 1 00:00:00 2007 +0000
 259
 260     initial
 261
 262     Signed-off-by: Commiter Name <commiter@email>
 263
 264 diff --git a/def b/def
 265 new file mode 100644
 266 index 0000000..8baef1b
 267 --- /dev/null
 268 +++ b/def
 269 @@ -0,0 +1 @@
 270 +abc
 271 % guilt-push --all
 272 Applying patch..modify
 273 Patch applied.
 274 Applying patch..add
 275 Patch applied.
 276 Applying patch..remove
 277 Patch applied.
 278 Applying patch..mode
 279 Patch applied.
 280 % guilt-pop mode (named, mode)
 281 Now at remove.
 282 % list_files
 283 d .git/patches
 284 d .git/patches/master
 285 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 286 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 287 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 288 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 289 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 290 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
 291 % git-log
 292 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
 293 Author: Author Name <author@email>
 294 Date:   Mon Jan 1 00:00:00 2007 +0000
 295
 296     patch remove
 297
 298 diff --git a/abd b/abd
 299 deleted file mode 100644
 300 index 489450e..0000000
 301 --- a/abd
 302 +++ /dev/null
 303 @@ -1 +0,0 @@
 304 -qweert
 305
 306 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 307 Author: Author Name <author@email>
 308 Date:   Mon Jan 1 00:00:00 2007 +0000
 309
 310     patch add
 311
 312 diff --git a/abd b/abd
 313 new file mode 100644
 314 index 0000000..489450e
 315 --- /dev/null
 316 +++ b/abd
 317 @@ -0,0 +1 @@
 318 +qweert
 319
 320 commit 33633e7a1aa31972f125878baf7807be57b1672d
 321 Author: Author Name <author@email>
 322 Date:   Mon Jan 1 00:00:00 2007 +0000
 323
 324     patch modify
 325
 326 diff --git a/def b/def
 327 index 8baef1b..7d69c2f 100644
 328 --- a/def
 329 +++ b/def
 330 @@ -1 +1,2 @@
 331  abc
 332 +asjhfksad
 333
 334 commit d4850419ccc1146c7169f500725ce504b9774ed0
 335 Author: Author Name <author@email>
 336 Date:   Mon Jan 1 00:00:00 2007 +0000
 337
 338     initial
 339
 340     Signed-off-by: Commiter Name <commiter@email>
 341
 342 diff --git a/def b/def
 343 new file mode 100644
 344 index 0000000..8baef1b
 345 --- /dev/null
 346 +++ b/def
 347 @@ -0,0 +1 @@
 348 +abc
 349 % guilt-push --all
 350 Applying patch..mode
 351 Patch applied.
 352 % guilt-pop remove (named, remove)
 353 Now at add.
 354 % list_files
 355 d .git/patches
 356 d .git/patches/master
 357 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 358 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 359 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 360 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 361 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 362 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
 363 % git-log
 364 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 365 Author: Author Name <author@email>
 366 Date:   Mon Jan 1 00:00:00 2007 +0000
 367
 368     patch add
 369
 370 diff --git a/abd b/abd
 371 new file mode 100644
 372 index 0000000..489450e
 373 --- /dev/null
 374 +++ b/abd
 375 @@ -0,0 +1 @@
 376 +qweert
 377
 378 commit 33633e7a1aa31972f125878baf7807be57b1672d
 379 Author: Author Name <author@email>
 380 Date:   Mon Jan 1 00:00:00 2007 +0000
 381
 382     patch modify
 383
 384 diff --git a/def b/def
 385 index 8baef1b..7d69c2f 100644
 386 --- a/def
 387 +++ b/def
 388 @@ -1 +1,2 @@
 389  abc
 390 +asjhfksad
 391
 392 commit d4850419ccc1146c7169f500725ce504b9774ed0
 393 Author: Author Name <author@email>
 394 Date:   Mon Jan 1 00:00:00 2007 +0000
 395
 396     initial
 397
 398     Signed-off-by: Commiter Name <commiter@email>
 399
 400 diff --git a/def b/def
 401 new file mode 100644
 402 index 0000000..8baef1b
 403 --- /dev/null
 404 +++ b/def
 405 @@ -0,0 +1 @@
 406 +abc
 407 % guilt-push --all
 408 Applying patch..remove
 409 Patch applied.
 410 Applying patch..mode
 411 Patch applied.
 412 % guilt-pop add (named, add)
 413 Now at modify.
 414 % list_files
 415 d .git/patches
 416 d .git/patches/master
 417 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 418 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 419 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 420 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
 421 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 422 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 423 % git-log
 424 commit 33633e7a1aa31972f125878baf7807be57b1672d
 425 Author: Author Name <author@email>
 426 Date:   Mon Jan 1 00:00:00 2007 +0000
 427
 428     patch modify
 429
 430 diff --git a/def b/def
 431 index 8baef1b..7d69c2f 100644
 432 --- a/def
 433 +++ b/def
 434 @@ -1 +1,2 @@
 435  abc
 436 +asjhfksad
 437
 438 commit d4850419ccc1146c7169f500725ce504b9774ed0
 439 Author: Author Name <author@email>
 440 Date:   Mon Jan 1 00:00:00 2007 +0000
 441
 442     initial
 443
 444     Signed-off-by: Commiter Name <commiter@email>
 445
 446 diff --git a/def b/def
 447 new file mode 100644
 448 index 0000000..8baef1b
 449 --- /dev/null
 450 +++ b/def
 451 @@ -0,0 +1 @@
 452 +abc
 453 % guilt-push --all
 454 Applying patch..add
 455 Patch applied.
 456 Applying patch..remove
 457 Patch applied.
 458 Applying patch..mode
 459 Patch applied.
 460 % guilt-pop modify (named, modify)
 461 All patches popped.
 462 % list_files
 463 d .git/patches
 464 d .git/patches/master
 465 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 466 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 467 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 468 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 469 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 470 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
 471 % git-log
 472 commit d4850419ccc1146c7169f500725ce504b9774ed0
 473 Author: Author Name <author@email>
 474 Date:   Mon Jan 1 00:00:00 2007 +0000
 475
 476     initial
 477
 478     Signed-off-by: Commiter Name <commiter@email>
 479
 480 diff --git a/def b/def
 481 new file mode 100644
 482 index 0000000..8baef1b
 483 --- /dev/null
 484 +++ b/def
 485 @@ -0,0 +1 @@
 486 +abc
 487 % guilt-push --all
 488 Applying patch..modify
 489 Patch applied.
 490 Applying patch..add
 491 Patch applied.
 492 Applying patch..remove
 493 Patch applied.
 494 Applying patch..mode
 495 Patch applied.
 496 % guilt-pop mode (name, incremental, mode)
 497 Now at remove.
 498 % list_files
 499 d .git/patches
 500 d .git/patches/master
 501 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 502 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 503 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 504 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 505 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 506 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
 507 % git-log
 508 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
 509 Author: Author Name <author@email>
 510 Date:   Mon Jan 1 00:00:00 2007 +0000
 511
 512     patch remove
 513
 514 diff --git a/abd b/abd
 515 deleted file mode 100644
 516 index 489450e..0000000
 517 --- a/abd
 518 +++ /dev/null
 519 @@ -1 +0,0 @@
 520 -qweert
 521
 522 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 523 Author: Author Name <author@email>
 524 Date:   Mon Jan 1 00:00:00 2007 +0000
 525
 526     patch add
 527
 528 diff --git a/abd b/abd
 529 new file mode 100644
 530 index 0000000..489450e
 531 --- /dev/null
 532 +++ b/abd
 533 @@ -0,0 +1 @@
 534 +qweert
 535
 536 commit 33633e7a1aa31972f125878baf7807be57b1672d
 537 Author: Author Name <author@email>
 538 Date:   Mon Jan 1 00:00:00 2007 +0000
 539
 540     patch modify
 541
 542 diff --git a/def b/def
 543 index 8baef1b..7d69c2f 100644
 544 --- a/def
 545 +++ b/def
 546 @@ -1 +1,2 @@
 547  abc
 548 +asjhfksad
 549
 550 commit d4850419ccc1146c7169f500725ce504b9774ed0
 551 Author: Author Name <author@email>
 552 Date:   Mon Jan 1 00:00:00 2007 +0000
 553
 554     initial
 555
 556     Signed-off-by: Commiter Name <commiter@email>
 557
 558 diff --git a/def b/def
 559 new file mode 100644
 560 index 0000000..8baef1b
 561 --- /dev/null
 562 +++ b/def
 563 @@ -0,0 +1 @@
 564 +abc
 565 % guilt-pop remove (name, incremental, remove)
 566 Now at add.
 567 % list_files
 568 d .git/patches
 569 d .git/patches/master
 570 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 571 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 572 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 573 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 574 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 575 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
 576 % git-log
 577 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 578 Author: Author Name <author@email>
 579 Date:   Mon Jan 1 00:00:00 2007 +0000
 580
 581     patch add
 582
 583 diff --git a/abd b/abd
 584 new file mode 100644
 585 index 0000000..489450e
 586 --- /dev/null
 587 +++ b/abd
 588 @@ -0,0 +1 @@
 589 +qweert
 590
 591 commit 33633e7a1aa31972f125878baf7807be57b1672d
 592 Author: Author Name <author@email>
 593 Date:   Mon Jan 1 00:00:00 2007 +0000
 594
 595     patch modify
 596
 597 diff --git a/def b/def
 598 index 8baef1b..7d69c2f 100644
 599 --- a/def
 600 +++ b/def
 601 @@ -1 +1,2 @@
 602  abc
 603 +asjhfksad
 604
 605 commit d4850419ccc1146c7169f500725ce504b9774ed0
 606 Author: Author Name <author@email>
 607 Date:   Mon Jan 1 00:00:00 2007 +0000
 608
 609     initial
 610
 611     Signed-off-by: Commiter Name <commiter@email>
 612
 613 diff --git a/def b/def
 614 new file mode 100644
 615 index 0000000..8baef1b
 616 --- /dev/null
 617 +++ b/def
 618 @@ -0,0 +1 @@
 619 +abc
 620 % guilt-pop add (name, incremental, add)
 621 Now at modify.
 622 % list_files
 623 d .git/patches
 624 d .git/patches/master
 625 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 626 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 627 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 628 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
 629 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 630 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 631 % git-log
 632 commit 33633e7a1aa31972f125878baf7807be57b1672d
 633 Author: Author Name <author@email>
 634 Date:   Mon Jan 1 00:00:00 2007 +0000
 635
 636     patch modify
 637
 638 diff --git a/def b/def
 639 index 8baef1b..7d69c2f 100644
 640 --- a/def
 641 +++ b/def
 642 @@ -1 +1,2 @@
 643  abc
 644 +asjhfksad
 645
 646 commit d4850419ccc1146c7169f500725ce504b9774ed0
 647 Author: Author Name <author@email>
 648 Date:   Mon Jan 1 00:00:00 2007 +0000
 649
 650     initial
 651
 652     Signed-off-by: Commiter Name <commiter@email>
 653
 654 diff --git a/def b/def
 655 new file mode 100644
 656 index 0000000..8baef1b
 657 --- /dev/null
 658 +++ b/def
 659 @@ -0,0 +1 @@
 660 +abc
 661 % guilt-pop modify (name, incremental, modify)
 662 All patches popped.
 663 % list_files
 664 d .git/patches
 665 d .git/patches/master
 666 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 667 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 668 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 669 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 670 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 671 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
 672 % git-log
 673 commit d4850419ccc1146c7169f500725ce504b9774ed0
 674 Author: Author Name <author@email>
 675 Date:   Mon Jan 1 00:00:00 2007 +0000
 676
 677     initial
 678
 679     Signed-off-by: Commiter Name <commiter@email>
 680
 681 diff --git a/def b/def
 682 new file mode 100644
 683 index 0000000..8baef1b
 684 --- /dev/null
 685 +++ b/def
 686 @@ -0,0 +1 @@
 687 +abc
 688 % guilt-push --all
 689 Applying patch..modify
 690 Patch applied.
 691 Applying patch..add
 692 Patch applied.
 693 Applying patch..remove
 694 Patch applied.
 695 Applying patch..mode
 696 Patch applied.
 697 % guilt-pop -n -2
 698 Invalid number of patches to pop.
 699 % list_files
 700 d .git/patches
 701 d .git/patches/master
 702 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 703 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
 704 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 705 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 706 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 707 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 708 % git-log
 709 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
 710 Author: Author Name <author@email>
 711 Date:   Mon Jan 1 00:00:00 2007 +0000
 712
 713     patch mode
 714
 715 diff --git a/def b/def
 716 old mode 100644
 717 new mode 100755
 718
 719 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
 720 Author: Author Name <author@email>
 721 Date:   Mon Jan 1 00:00:00 2007 +0000
 722
 723     patch remove
 724
 725 diff --git a/abd b/abd
 726 deleted file mode 100644
 727 index 489450e..0000000
 728 --- a/abd
 729 +++ /dev/null
 730 @@ -1 +0,0 @@
 731 -qweert
 732
 733 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 734 Author: Author Name <author@email>
 735 Date:   Mon Jan 1 00:00:00 2007 +0000
 736
 737     patch add
 738
 739 diff --git a/abd b/abd
 740 new file mode 100644
 741 index 0000000..489450e
 742 --- /dev/null
 743 +++ b/abd
 744 @@ -0,0 +1 @@
 745 +qweert
 746
 747 commit 33633e7a1aa31972f125878baf7807be57b1672d
 748 Author: Author Name <author@email>
 749 Date:   Mon Jan 1 00:00:00 2007 +0000
 750
 751     patch modify
 752
 753 diff --git a/def b/def
 754 index 8baef1b..7d69c2f 100644
 755 --- a/def
 756 +++ b/def
 757 @@ -1 +1,2 @@
 758  abc
 759 +asjhfksad
 760
 761 commit d4850419ccc1146c7169f500725ce504b9774ed0
 762 Author: Author Name <author@email>
 763 Date:   Mon Jan 1 00:00:00 2007 +0000
 764
 765     initial
 766
 767     Signed-off-by: Commiter Name <commiter@email>
 768
 769 diff --git a/def b/def
 770 new file mode 100644
 771 index 0000000..8baef1b
 772 --- /dev/null
 773 +++ b/def
 774 @@ -0,0 +1 @@
 775 +abc
 776 % guilt-push --all
 777 % guilt-pop -n -1
 778 Invalid number of patches to pop.
 779 % list_files
 780 d .git/patches
 781 d .git/patches/master
 782 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 783 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
 784 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 785 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 786 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 787 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 788 % git-log
 789 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
 790 Author: Author Name <author@email>
 791 Date:   Mon Jan 1 00:00:00 2007 +0000
 792
 793     patch mode
 794
 795 diff --git a/def b/def
 796 old mode 100644
 797 new mode 100755
 798
 799 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
 800 Author: Author Name <author@email>
 801 Date:   Mon Jan 1 00:00:00 2007 +0000
 802
 803     patch remove
 804
 805 diff --git a/abd b/abd
 806 deleted file mode 100644
 807 index 489450e..0000000
 808 --- a/abd
 809 +++ /dev/null
 810 @@ -1 +0,0 @@
 811 -qweert
 812
 813 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 814 Author: Author Name <author@email>
 815 Date:   Mon Jan 1 00:00:00 2007 +0000
 816
 817     patch add
 818
 819 diff --git a/abd b/abd
 820 new file mode 100644
 821 index 0000000..489450e
 822 --- /dev/null
 823 +++ b/abd
 824 @@ -0,0 +1 @@
 825 +qweert
 826
 827 commit 33633e7a1aa31972f125878baf7807be57b1672d
 828 Author: Author Name <author@email>
 829 Date:   Mon Jan 1 00:00:00 2007 +0000
 830
 831     patch modify
 832
 833 diff --git a/def b/def
 834 index 8baef1b..7d69c2f 100644
 835 --- a/def
 836 +++ b/def
 837 @@ -1 +1,2 @@
 838  abc
 839 +asjhfksad
 840
 841 commit d4850419ccc1146c7169f500725ce504b9774ed0
 842 Author: Author Name <author@email>
 843 Date:   Mon Jan 1 00:00:00 2007 +0000
 844
 845     initial
 846
 847     Signed-off-by: Commiter Name <commiter@email>
 848
 849 diff --git a/def b/def
 850 new file mode 100644
 851 index 0000000..8baef1b
 852 --- /dev/null
 853 +++ b/def
 854 @@ -0,0 +1 @@
 855 +abc
 856 % guilt-push --all
 857 % guilt-pop -n 0
 858 No patches requested to be removed.
 859 % list_files
 860 d .git/patches
 861 d .git/patches/master
 862 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 863 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
 864 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 865 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 866 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 867 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 868 % git-log
 869 commit 632ca0f5ec27a961990b45673dfc751f1da830f3
 870 Author: Author Name <author@email>
 871 Date:   Mon Jan 1 00:00:00 2007 +0000
 872
 873     patch mode
 874
 875 diff --git a/def b/def
 876 old mode 100644
 877 new mode 100755
 878
 879 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
 880 Author: Author Name <author@email>
 881 Date:   Mon Jan 1 00:00:00 2007 +0000
 882
 883     patch remove
 884
 885 diff --git a/abd b/abd
 886 deleted file mode 100644
 887 index 489450e..0000000
 888 --- a/abd
 889 +++ /dev/null
 890 @@ -1 +0,0 @@
 891 -qweert
 892
 893 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 894 Author: Author Name <author@email>
 895 Date:   Mon Jan 1 00:00:00 2007 +0000
 896
 897     patch add
 898
 899 diff --git a/abd b/abd
 900 new file mode 100644
 901 index 0000000..489450e
 902 --- /dev/null
 903 +++ b/abd
 904 @@ -0,0 +1 @@
 905 +qweert
 906
 907 commit 33633e7a1aa31972f125878baf7807be57b1672d
 908 Author: Author Name <author@email>
 909 Date:   Mon Jan 1 00:00:00 2007 +0000
 910
 911     patch modify
 912
 913 diff --git a/def b/def
 914 index 8baef1b..7d69c2f 100644
 915 --- a/def
 916 +++ b/def
 917 @@ -1 +1,2 @@
 918  abc
 919 +asjhfksad
 920
 921 commit d4850419ccc1146c7169f500725ce504b9774ed0
 922 Author: Author Name <author@email>
 923 Date:   Mon Jan 1 00:00:00 2007 +0000
 924
 925     initial
 926
 927     Signed-off-by: Commiter Name <commiter@email>
 928
 929 diff --git a/def b/def
 930 new file mode 100644
 931 index 0000000..8baef1b
 932 --- /dev/null
 933 +++ b/def
 934 @@ -0,0 +1 @@
 935 +abc
 936 % guilt-push --all
 937 % guilt-pop -n 1
 938 Now at remove.
 939 % list_files
 940 d .git/patches
 941 d .git/patches/master
 942 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
 943 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
 944 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
 945 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
 946 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
 947 f f8012069806c3baed27b8f661c19083211fb7ca9  .git/patches/master/status
 948 % git-log
 949 commit e67345cf1e7e9594c73efad7381a994f1fe63b14
 950 Author: Author Name <author@email>
 951 Date:   Mon Jan 1 00:00:00 2007 +0000
 952
 953     patch remove
 954
 955 diff --git a/abd b/abd
 956 deleted file mode 100644
 957 index 489450e..0000000
 958 --- a/abd
 959 +++ /dev/null
 960 @@ -1 +0,0 @@
 961 -qweert
 962
 963 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
 964 Author: Author Name <author@email>
 965 Date:   Mon Jan 1 00:00:00 2007 +0000
 966
 967     patch add
 968
 969 diff --git a/abd b/abd
 970 new file mode 100644
 971 index 0000000..489450e
 972 --- /dev/null
 973 +++ b/abd
 974 @@ -0,0 +1 @@
 975 +qweert
 976
 977 commit 33633e7a1aa31972f125878baf7807be57b1672d
 978 Author: Author Name <author@email>
 979 Date:   Mon Jan 1 00:00:00 2007 +0000
 980
 981     patch modify
 982
 983 diff --git a/def b/def
 984 index 8baef1b..7d69c2f 100644
 985 --- a/def
 986 +++ b/def
 987 @@ -1 +1,2 @@
 988  abc
 989 +asjhfksad
 990
 991 commit d4850419ccc1146c7169f500725ce504b9774ed0
 992 Author: Author Name <author@email>
 993 Date:   Mon Jan 1 00:00:00 2007 +0000
 994
 995     initial
 996
 997     Signed-off-by: Commiter Name <commiter@email>
 998
 999 diff --git a/def b/def
1000 new file mode 100644
1001 index 0000000..8baef1b
1002 --- /dev/null
1003 +++ b/def
1004 @@ -0,0 +1 @@
1005 +abc
1006 % guilt-push --all
1007 Applying patch..mode
1008 Patch applied.
1009 % guilt-pop -n 2
1010 Now at add.
1011 % list_files
1012 d .git/patches
1013 d .git/patches/master
1014 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1015 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1016 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1017 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1018 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1019 f fc42fbc05afb7265d358add98f500f83bf29aea7  .git/patches/master/status
1020 % git-log
1021 commit 68f33a015dcfd09c3896f15d152378b54eaa4eb6
1022 Author: Author Name <author@email>
1023 Date:   Mon Jan 1 00:00:00 2007 +0000
1024
1025     patch add
1026
1027 diff --git a/abd b/abd
1028 new file mode 100644
1029 index 0000000..489450e
1030 --- /dev/null
1031 +++ b/abd
1032 @@ -0,0 +1 @@
1033 +qweert
1034
1035 commit 33633e7a1aa31972f125878baf7807be57b1672d
1036 Author: Author Name <author@email>
1037 Date:   Mon Jan 1 00:00:00 2007 +0000
1038
1039     patch modify
1040
1041 diff --git a/def b/def
1042 index 8baef1b..7d69c2f 100644
1043 --- a/def
1044 +++ b/def
1045 @@ -1 +1,2 @@
1046  abc
1047 +asjhfksad
1048
1049 commit d4850419ccc1146c7169f500725ce504b9774ed0
1050 Author: Author Name <author@email>
1051 Date:   Mon Jan 1 00:00:00 2007 +0000
1052
1053     initial
1054
1055     Signed-off-by: Commiter Name <commiter@email>
1056
1057 diff --git a/def b/def
1058 new file mode 100644
1059 index 0000000..8baef1b
1060 --- /dev/null
1061 +++ b/def
1062 @@ -0,0 +1 @@
1063 +abc
1064 % guilt-push --all
1065 Applying patch..remove
1066 Patch applied.
1067 Applying patch..mode
1068 Patch applied.
1069 % guilt-pop -n 3
1070 Now at modify.
1071 % list_files
1072 d .git/patches
1073 d .git/patches/master
1074 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1075 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1076 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1077 f a19b18afeac33e6a55ef55b93cf0bca721e5610b  .git/patches/master/status
1078 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1079 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1080 % git-log
1081 commit 33633e7a1aa31972f125878baf7807be57b1672d
1082 Author: Author Name <author@email>
1083 Date:   Mon Jan 1 00:00:00 2007 +0000
1084
1085     patch modify
1086
1087 diff --git a/def b/def
1088 index 8baef1b..7d69c2f 100644
1089 --- a/def
1090 +++ b/def
1091 @@ -1 +1,2 @@
1092  abc
1093 +asjhfksad
1094
1095 commit d4850419ccc1146c7169f500725ce504b9774ed0
1096 Author: Author Name <author@email>
1097 Date:   Mon Jan 1 00:00:00 2007 +0000
1098
1099     initial
1100
1101     Signed-off-by: Commiter Name <commiter@email>
1102
1103 diff --git a/def b/def
1104 new file mode 100644
1105 index 0000000..8baef1b
1106 --- /dev/null
1107 +++ b/def
1108 @@ -0,0 +1 @@
1109 +abc
1110 % guilt-push --all
1111 Applying patch..add
1112 Patch applied.
1113 Applying patch..remove
1114 Patch applied.
1115 Applying patch..mode
1116 Patch applied.
1117 % guilt-pop -n 4
1118 All patches popped.
1119 % list_files
1120 d .git/patches
1121 d .git/patches/master
1122 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1123 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1124 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1125 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1126 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify
1127 f da39a3ee5e6b4b0d3255bfef95601890afd80709  .git/patches/master/status
1128 % git-log
1129 commit d4850419ccc1146c7169f500725ce504b9774ed0
1130 Author: Author Name <author@email>
1131 Date:   Mon Jan 1 00:00:00 2007 +0000
1132
1133     initial
1134
1135     Signed-off-by: Commiter Name <commiter@email>
1136
1137 diff --git a/def b/def
1138 new file mode 100644
1139 index 0000000..8baef1b
1140 --- /dev/null
1141 +++ b/def
1142 @@ -0,0 +1 @@
1143 +abc
1144 % guilt-push --all
1145 Applying patch..modify
1146 Patch applied.
1147 Applying patch..add
1148 Patch applied.
1149 Applying patch..remove
1150 Patch applied.
1151 Applying patch..mode
1152 Patch applied.
1153 % list_files
1154 d .git/patches
1155 d .git/patches/master
1156 f 22930c6d1f1938f298a4fca51c57e4b47171db21  .git/patches/master/mode
1157 f 49571a872d2f2f1a8c56e65352c0f9b8aff53143  .git/patches/master/status
1158 f 5d8322e2edfca0589cc24df9c09985a544591a2c  .git/patches/master/add
1159 f 8bdf2abdb045e63bb877890db12afcd5a2f023eb  .git/patches/master/remove
1160 f bacb4aad8a55fe4e7aa58a9ae169990bb764069f  .git/patches/master/series
1161 f bc9ab2e0f5db99d483961e956e814d963f0309f8  .git/patches/master/modify