Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-guards.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 10 Aug 2006 14:58:10 -0700
changeset 2832 582cbc4392cb
parent 2818 05316bb57d01
child 2838 851b07ec450c
permissions -rw-r--r--
qselect: add --pop, --reapply options
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2815
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding x
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
Patch queue now empty
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
% should fail
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
abort: no patches applied
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
applying a.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
Now at: a.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
% should guard a.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
% should print +a
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     9
 
a.patch: +a
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
Patch queue now empty
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
a.patch: +a
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
% should push b.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
applying b.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
Now at: b.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
Patch queue now empty
2832
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    16
 
number of unguarded, unapplied patches has changed from 2 to 3
2815
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    17
 
% should push a.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    18
 
applying a.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    19
 
Now at: a.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    20
 
% should print -a
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    21
 
c.patch: -a
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    22
 
% should skip c.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    23
 
applying b.patch
2818
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    24
 
skipping c.patch - guarded by '- a'
2815
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    25
 
Now at: b.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    26
 
% should push c.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    27
 
applying c.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    28
 
Now at: c.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    29
 
Patch queue now empty
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    30
 
guards deactivated
2832
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    31
 
number of unguarded, unapplied patches has changed from 3 to 2
2818
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    32
 
% should push all
2815
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    33
 
applying b.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    34
 
applying c.patch
bce6918b0474 tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    35
 
Now at: c.patch
2818
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    36
 
Patch queue now empty
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    37
 
% should push b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    38
 
applying b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    39
 
Now at: b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    40
 
Patch queue now empty
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    41
 
applying b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    42
 
Now at: b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    43
 
Patch queue now empty
2832
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    44
 
number of unguarded, unapplied patches has changed from 2 to 3
2818
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    45
 
% should push a.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    46
 
applying a.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    47
 
Now at: a.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    48
 
Patch queue now empty
2832
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    49
 
number of unguarded, unapplied patches has changed from 3 to 2
2818
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    50
 
% should push b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    51
 
applying b.patch
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2815
diff changeset 
    52
 
Now at: b.patch
2832
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    53
 
applying c.patch
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    54
 
Now at: c.patch
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    55
 
guards deactivated
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    56
 
popping guarded patches
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    57
 
Patch queue now empty
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    58
 
reapplying unguarded patches
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    59
 
applying b.patch
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    60
 
applying c.patch
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2818
diff changeset 
    61
 
Now at: c.patch
mercurial-crew-with-dirclash