Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq.out @ 2899:bee4b7abcb01
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 14 Aug 2006 14:42:15 -0500 |
parents | 474adc2bc5f7 |
children | 41f8b041893b |
comparison
equal
deleted
inserted
replaced
2898:06c05c675a35 | 2899:bee4b7abcb01 |
---|---|
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 |
100 % pop, qnext, qprev, qapplied | 101 % pop, qnext, qprev, qapplied |
101 Now at: test.patch | 102 Now at: test.patch |
102 test2.patch | 103 test2.patch |
103 Only one patch applied | 104 Only one patch applied |
104 test.patch | 105 test.patch |
106 % commit should fail | |
107 abort: cannot commit over an applied mq patch | |
108 % push should fail | |
109 pushing to ../../k | |
110 abort: source has mq patches applied | |
105 % qunapplied | 111 % qunapplied |
106 test2.patch | 112 test2.patch |
113 % push should succeed | |
114 Patch queue now empty | |
115 pushing to ../../k | |
116 searching for changes | |
117 adding changesets | |
118 adding manifests | |
119 adding file changes | |
120 added 1 changesets with 1 changes to 1 files | |
107 % strip | 121 % strip |
108 adding x | 122 adding x |
109 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 123 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
110 saving bundle to | 124 saving bundle to |
111 adding changesets | 125 adding changesets |