Show More
@@ -191,7 +191,8 b' handle subrepos safely on qrefresh' | |||||
191 |
|
191 | |||
192 | $ hg qpop -qa |
|
192 | $ hg qpop -qa | |
193 | patch queue now empty |
|
193 | patch queue now empty | |
194 |
$ EXTRA='hg qnew -m2 2.diff' |
|
194 | $ EXTRA='hg qnew -m2 2.diff' | |
|
195 | $ testrm1 qrefresh | |||
195 | adding a |
|
196 | adding a | |
196 | % update substate when removing .hgsub w/dirty subrepo |
|
197 | % update substate when removing .hgsub w/dirty subrepo | |
197 | M sub3/a |
|
198 | M sub3/a | |
@@ -201,12 +202,14 b' handle subrepos safely on qrefresh' | |||||
201 |
|
202 | |||
202 | $ hg qpop -qa |
|
203 | $ hg qpop -qa | |
203 | patch queue now empty |
|
204 | patch queue now empty | |
204 |
$ EXTRA='hg qnew -m3 3.diff' |
|
205 | $ EXTRA='hg qnew -m3 3.diff' | |
|
206 | $ testrm2 qrefresh | |||
205 | adding a |
|
207 | adding a | |
206 | % update substate when removing .hgsub w/clean updated subrepo |
|
208 | % update substate when removing .hgsub w/clean updated subrepo | |
207 | R .hgsub |
|
209 | R .hgsub | |
208 | % qrefresh |
|
210 | % qrefresh | |
209 | % debugsub should be empty |
|
211 | % debugsub should be empty | |
|
212 | $ EXTRA= | |||
210 |
|
213 | |||
211 | $ cd .. |
|
214 | $ cd .. | |
212 |
|
215 | |||
@@ -315,7 +318,7 b' handle subrepos safely on qrecord' | |||||
315 |
|
318 | |||
316 | $ hg qpop -qa |
|
319 | $ hg qpop -qa | |
317 | patch queue now empty |
|
320 | patch queue now empty | |
318 |
$ |
|
321 | $ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF | |
319 | > y |
|
322 | > y | |
320 | > y |
|
323 | > y | |
321 | > EOF |
|
324 | > EOF | |
@@ -331,7 +334,7 b' handle subrepos safely on qrecord' | |||||
331 |
|
334 | |||
332 | $ hg qpop -qa |
|
335 | $ hg qpop -qa | |
333 | patch queue now empty |
|
336 | patch queue now empty | |
334 |
$ |
|
337 | $ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF | |
335 | > y |
|
338 | > y | |
336 | > y |
|
339 | > y | |
337 | > EOF |
|
340 | > EOF |
General Comments 0
You need to be logged in to leave comments.
Login now