tests/test-mq-subrepo.t
branchstable
changeset 24845 8133494accf1
parent 24837 edf907bd8144
child 25418 c0995cd8ff6f
equal deleted inserted replaced
24844:6c6aee6d395b 24845:8133494accf1
   293   % qrecord --config ui.interactive=1 -m0 0.diff
   293   % qrecord --config ui.interactive=1 -m0 0.diff
   294   diff --git a/.hgsub b/.hgsub
   294   diff --git a/.hgsub b/.hgsub
   295   new file mode 100644
   295   new file mode 100644
   296   examine changes to '.hgsub'? [Ynesfdaq?] y
   296   examine changes to '.hgsub'? [Ynesfdaq?] y
   297   
   297   
       
   298   @@ -0,0 +1,1 @@
       
   299   +sub = sub
       
   300   record this change to '.hgsub'? [Ynesfdaq?] y
       
   301   
       
   302   warning: subrepo spec file '.hgsub' not found
   298   abort: uncommitted changes in subrepository 'sub'
   303   abort: uncommitted changes in subrepository 'sub'
   299   [255]
   304   [255]
   300   % update substate when adding .hgsub w/clean updated subrepo
   305   % update substate when adding .hgsub w/clean updated subrepo
   301   A .hgsub
   306   A .hgsub
   302   % qrecord --config ui.interactive=1 -m0 0.diff
   307   % qrecord --config ui.interactive=1 -m0 0.diff
   303   diff --git a/.hgsub b/.hgsub
   308   diff --git a/.hgsub b/.hgsub
   304   new file mode 100644
   309   new file mode 100644
   305   examine changes to '.hgsub'? [Ynesfdaq?] y
   310   examine changes to '.hgsub'? [Ynesfdaq?] y
   306   
   311   
       
   312   @@ -0,0 +1,1 @@
       
   313   +sub = sub
       
   314   record this change to '.hgsub'? [Ynesfdaq?] y
       
   315   
       
   316   warning: subrepo spec file '.hgsub' not found
   307   path sub
   317   path sub
   308    source   sub
   318    source   sub
   309    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   319    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   310   $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
   320   $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
   311   > y
   321   > y