equal
deleted
inserted
replaced
161 qpush --exact --force with changes to an unpatched file |
161 qpush --exact --force with changes to an unpatched file |
162 |
162 |
163 $ hg update 1 -q |
163 $ hg update 1 -q |
164 $ echo c0 >> f0 |
164 $ echo c0 >> f0 |
165 $ hg qpush -e |
165 $ hg qpush -e |
166 applying p0 |
166 abort: local changes found |
167 now at: p0 |
167 [255] |
168 $ cat f0 |
|
169 c0 |
|
170 $ hg qpop -aq |
|
171 patch queue now empty |
|
172 $ hg qpush -ef |
168 $ hg qpush -ef |
173 applying p0 |
169 applying p0 |
174 now at: p0 |
170 now at: p0 |
175 $ cat f0 |
171 $ cat f0 |
176 c0 |
172 c0 |
180 patch queue now empty |
176 patch queue now empty |
181 |
177 |
182 $ hg update 1 -q |
178 $ hg update 1 -q |
183 $ echo c0 >> f0 |
179 $ echo c0 >> f0 |
184 $ hg qpush -e p1 |
180 $ hg qpush -e p1 |
185 applying p0 |
181 abort: local changes found |
186 applying p1 |
182 [255] |
187 now at: p1 |
|
188 $ cat f0 |
|
189 c0 |
|
190 $ hg qpop -aq |
|
191 patch queue now empty |
|
192 $ hg qpush -e p1 -f |
183 $ hg qpush -e p1 -f |
193 applying p0 |
184 applying p0 |
194 applying p1 |
185 applying p1 |
195 now at: p1 |
186 now at: p1 |
196 $ cat f0 |
187 $ cat f0 |