equal
deleted
inserted
replaced
301 A .hgsub |
301 A .hgsub |
302 A sub/a |
302 A sub/a |
303 % qrecord --config ui.interactive=1 -m0 0.diff |
303 % qrecord --config ui.interactive=1 -m0 0.diff |
304 diff --git a/.hgsub b/.hgsub |
304 diff --git a/.hgsub b/.hgsub |
305 new file mode 100644 |
305 new file mode 100644 |
306 examine changes to '.hgsub'? [Ynesfdaq?] y |
306 examine changes to '.hgsub'? |
|
307 (enter ? for help) [Ynesfdaq?] y |
307 |
308 |
308 @@ -0,0 +1,1 @@ |
309 @@ -0,0 +1,1 @@ |
309 +sub = sub |
310 +sub = sub |
310 record this change to '.hgsub'? [Ynesfdaq?] y |
311 record this change to '.hgsub'? |
|
312 (enter ? for help) [Ynesfdaq?] y |
311 |
313 |
312 warning: subrepo spec file '.hgsub' not found |
314 warning: subrepo spec file '.hgsub' not found |
313 warning: subrepo spec file '.hgsub' not found |
315 warning: subrepo spec file '.hgsub' not found |
314 path sub |
316 path sub |
315 source sub |
317 source sub |
329 M .hgsub |
331 M .hgsub |
330 A sub2/a |
332 A sub2/a |
331 % qrecord --config ui.interactive=1 -m1 1.diff |
333 % qrecord --config ui.interactive=1 -m1 1.diff |
332 diff --git a/.hgsub b/.hgsub |
334 diff --git a/.hgsub b/.hgsub |
333 1 hunks, 1 lines changed |
335 1 hunks, 1 lines changed |
334 examine changes to '.hgsub'? [Ynesfdaq?] y |
336 examine changes to '.hgsub'? |
|
337 (enter ? for help) [Ynesfdaq?] y |
335 |
338 |
336 @@ -1,1 +1,2 @@ |
339 @@ -1,1 +1,2 @@ |
337 sub = sub |
340 sub = sub |
338 +sub2 = sub2 |
341 +sub2 = sub2 |
339 record this change to '.hgsub'? [Ynesfdaq?] y |
342 record this change to '.hgsub'? |
|
343 (enter ? for help) [Ynesfdaq?] y |
340 |
344 |
341 path sub |
345 path sub |
342 source sub |
346 source sub |
343 revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
347 revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
344 path sub2 |
348 path sub2 |
356 M sub3/a |
360 M sub3/a |
357 R .hgsub |
361 R .hgsub |
358 % qrecord --config ui.interactive=1 -m2 2.diff |
362 % qrecord --config ui.interactive=1 -m2 2.diff |
359 diff --git a/.hgsub b/.hgsub |
363 diff --git a/.hgsub b/.hgsub |
360 deleted file mode 100644 |
364 deleted file mode 100644 |
361 examine changes to '.hgsub'? [Ynesfdaq?] y |
365 examine changes to '.hgsub'? |
|
366 (enter ? for help) [Ynesfdaq?] y |
362 |
367 |
363 % debugsub should be empty |
368 % debugsub should be empty |
364 |
369 |
365 $ hg qpop -qa |
370 $ hg qpop -qa |
366 patch queue now empty |
371 patch queue now empty |
372 % update substate when removing .hgsub w/clean updated subrepo |
377 % update substate when removing .hgsub w/clean updated subrepo |
373 R .hgsub |
378 R .hgsub |
374 % qrecord --config ui.interactive=1 -m3 3.diff |
379 % qrecord --config ui.interactive=1 -m3 3.diff |
375 diff --git a/.hgsub b/.hgsub |
380 diff --git a/.hgsub b/.hgsub |
376 deleted file mode 100644 |
381 deleted file mode 100644 |
377 examine changes to '.hgsub'? [Ynesfdaq?] y |
382 examine changes to '.hgsub'? |
|
383 (enter ? for help) [Ynesfdaq?] y |
378 |
384 |
379 % debugsub should be empty |
385 % debugsub should be empty |
380 |
386 |
381 $ cd .. |
387 $ cd .. |
382 |
388 |