Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq-guards.out @ 3044:fcadf7a32425
Merge with mpm
| author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Sun, 03 Sep 2006 06:06:02 -0400 |
| parents | 851b07ec450c |
| children | 193e9c6d1a6d |
comparison
equal
deleted
inserted
replaced
| 3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
|---|---|
| 1 adding x | |
| 2 Patch queue now empty | |
| 3 % should fail | |
| 4 abort: no patches applied | |
| 5 applying a.patch | |
| 6 Now at: a.patch | |
| 7 % should guard a.patch | |
| 8 % should print +a | |
| 9 a.patch: +a | |
| 10 Patch queue now empty | |
| 11 a.patch: +a | |
| 12 % should push b.patch | |
| 13 applying b.patch | |
| 14 Now at: b.patch | |
| 15 Patch queue now empty | |
| 16 number of unguarded, unapplied patches has changed from 2 to 3 | |
| 17 % should push a.patch | |
| 18 applying a.patch | |
| 19 Now at: a.patch | |
| 20 % should print -a | |
| 21 c.patch: -a | |
| 22 % should skip c.patch | |
| 23 applying b.patch | |
| 24 skipping c.patch - guarded by '- a' | |
| 25 Now at: b.patch | |
| 26 % should push c.patch | |
| 27 applying c.patch | |
| 28 Now at: c.patch | |
| 29 Patch queue now empty | |
| 30 guards deactivated | |
| 31 number of unguarded, unapplied patches has changed from 3 to 2 | |
| 32 % should push all | |
| 33 applying b.patch | |
| 34 applying c.patch | |
| 35 Now at: c.patch | |
| 36 Patch queue now empty | |
| 37 number of unguarded, unapplied patches has changed from 1 to 2 | |
| 38 % should push a.patch, not b.patch | |
| 39 applying a.patch | |
| 40 Now at: a.patch | |
| 41 applying c.patch | |
| 42 Now at: c.patch | |
| 43 Patch queue now empty | |
| 44 % should push b.patch | |
| 45 applying b.patch | |
| 46 Now at: b.patch | |
| 47 Patch queue now empty | |
| 48 number of unguarded, unapplied patches has changed from 2 to 3 | |
| 49 % should push a.patch, b.patch | |
| 50 applying a.patch | |
| 51 Now at: a.patch | |
| 52 applying b.patch | |
| 53 Now at: b.patch | |
| 54 Patch queue now empty | |
| 55 number of unguarded, unapplied patches has changed from 3 to 2 | |
| 56 % list patches and guards | |
| 57 a.patch: +1 +2 -3 | |
| 58 b.patch: +2 | |
| 59 c.patch: unguarded | |
| 60 % list series | |
| 61 0 G a.patch | |
| 62 1 U b.patch | |
| 63 2 U c.patch | |
| 64 % list guards | |
| 65 1 | |
| 66 2 | |
| 67 3 | |
| 68 % should push b.patch | |
| 69 applying b.patch | |
| 70 Now at: b.patch | |
| 71 applying c.patch | |
| 72 Now at: c.patch | |
| 73 guards deactivated | |
| 74 popping guarded patches | |
| 75 Patch queue now empty | |
| 76 reapplying unguarded patches | |
| 77 applying c.patch | |
| 78 Now at: c.patch | |
| 79 % guards in series file: +1 +2 -3 | |
| 80 +1 | |
| 81 +2 | |
| 82 -3 | |
| 83 % should show c.patch | |
| 84 c.patch |