Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq.out @ 2836:307439d6fede
mq: do not allow to push from repo with patches applied
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 10 Aug 2006 16:10:59 -0700 |
parents | b8d587cfa3bb |
children | 474adc2bc5f7 |
comparison
equal
deleted
inserted
replaced
2835:2ff57e3113a4 | 2836:307439d6fede |
---|---|
47 qseries print the entire series file | 47 qseries print the entire series file |
48 qtop print the name of the current patch | 48 qtop print the name of the current patch |
49 qunapplied print the patches not yet applied | 49 qunapplied print the patches not yet applied |
50 strip strip a revision and all later revs on the same branch | 50 strip strip a revision and all later revs on the same branch |
51 adding a | 51 adding a |
52 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
52 adding b/z | 53 adding b/z |
53 % qinit | 54 % qinit |
54 % -R qinit | 55 % -R qinit |
55 % qinit -c | 56 % qinit -c |
56 A .hgignore | 57 A .hgignore |
102 test2.patch | 103 test2.patch |
103 Only one patch applied | 104 Only one patch applied |
104 test.patch | 105 test.patch |
105 % commit should fail | 106 % commit should fail |
106 abort: cannot commit over an applied mq patch | 107 abort: cannot commit over an applied mq patch |
108 % push should fail | |
109 pushing to ../../k | |
110 abort: source has mq patches applied | |
107 % qunapplied | 111 % qunapplied |
108 test2.patch | 112 test2.patch |
109 % strip | 113 % strip |
110 adding x | 114 adding x |
111 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 115 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |