tests/test-mq-subrepo.t
changeset 16073 b254f827b7a6
parent 15321 e174353e8cda
child 16324 46b991a1f428
equal deleted inserted replaced
16072:bcb973abcc0b 16073:b254f827b7a6
   103   abort: uncommitted changes in subrepository sub
   103   abort: uncommitted changes in subrepository sub
   104   [255]
   104   [255]
   105   % update substate when adding .hgsub w/clean updated subrepo
   105   % update substate when adding .hgsub w/clean updated subrepo
   106   A .hgsub
   106   A .hgsub
   107   % qnew -m0 0.diff
   107   % qnew -m0 0.diff
   108   committing subrepository sub
       
   109   path sub
   108   path sub
   110    source   sub
   109    source   sub
   111    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   110    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   112 
   111 
   113   $ testmod qnew -m1 1.diff
   112   $ testmod qnew -m1 1.diff
   119   abort: uncommitted changes in subrepository sub2
   118   abort: uncommitted changes in subrepository sub2
   120   [255]
   119   [255]
   121   % update substate when modifying .hgsub w/clean updated subrepo
   120   % update substate when modifying .hgsub w/clean updated subrepo
   122   M .hgsub
   121   M .hgsub
   123   % qnew -m1 1.diff
   122   % qnew -m1 1.diff
   124   committing subrepository sub2
       
   125   path sub
   123   path sub
   126    source   sub
   124    source   sub
   127    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   125    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   128   path sub2
   126   path sub2
   129    source   sub2
   127    source   sub2
   164   abort: uncommitted changes in subrepository sub
   162   abort: uncommitted changes in subrepository sub
   165   [255]
   163   [255]
   166   % update substate when adding .hgsub w/clean updated subrepo
   164   % update substate when adding .hgsub w/clean updated subrepo
   167   A .hgsub
   165   A .hgsub
   168   % qrefresh
   166   % qrefresh
   169   committing subrepository sub
       
   170   path sub
   167   path sub
   171    source   sub
   168    source   sub
   172    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   169    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   173 
   170 
   174   $ hg qnew -m1 1.diff
   171   $ hg qnew -m1 1.diff
   181   abort: uncommitted changes in subrepository sub2
   178   abort: uncommitted changes in subrepository sub2
   182   [255]
   179   [255]
   183   % update substate when modifying .hgsub w/clean updated subrepo
   180   % update substate when modifying .hgsub w/clean updated subrepo
   184   M .hgsub
   181   M .hgsub
   185   % qrefresh
   182   % qrefresh
   186   committing subrepository sub2
       
   187   path sub
   183   path sub
   188    source   sub
   184    source   sub
   189    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   185    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   190   path sub2
   186   path sub2
   191    source   sub2
   187    source   sub2
   223   adding a
   219   adding a
   224   $ hg -R sub ci -m0sub
   220   $ hg -R sub ci -m0sub
   225   $ echo sub = sub > .hgsub
   221   $ echo sub = sub > .hgsub
   226   $ hg add .hgsub
   222   $ hg add .hgsub
   227   $ hg qnew -m0 0.diff
   223   $ hg qnew -m0 0.diff
   228   committing subrepository sub
       
   229   $ hg debugsub
   224   $ hg debugsub
   230   path sub
   225   path sub
   231    source   sub
   226    source   sub
   232    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   227    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   233 
   228 
   275   A .hgsub
   270   A .hgsub
   276   % qrecord --config ui.interactive=1 -m0 0.diff
   271   % qrecord --config ui.interactive=1 -m0 0.diff
   277   diff --git a/.hgsub b/.hgsub
   272   diff --git a/.hgsub b/.hgsub
   278   new file mode 100644
   273   new file mode 100644
   279   examine changes to '.hgsub'? [Ynsfdaq?] 
   274   examine changes to '.hgsub'? [Ynsfdaq?] 
   280   committing subrepository sub
       
   281   path sub
   275   path sub
   282    source   sub
   276    source   sub
   283    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   277    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   284 
   278 
   285   $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
   279   $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
   308   examine changes to '.hgsub'? [Ynsfdaq?] 
   302   examine changes to '.hgsub'? [Ynsfdaq?] 
   309   @@ -1,1 +1,2 @@
   303   @@ -1,1 +1,2 @@
   310    sub = sub
   304    sub = sub
   311   +sub2 = sub2
   305   +sub2 = sub2
   312   record this change to '.hgsub'? [Ynsfdaq?] 
   306   record this change to '.hgsub'? [Ynsfdaq?] 
   313   committing subrepository sub2
       
   314   path sub
   307   path sub
   315    source   sub
   308    source   sub
   316    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   309    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
   317   path sub2
   310   path sub2
   318    source   sub2
   311    source   sub2
   358   adding a
   351   adding a
   359   $ hg -R sub qnew sub0.diff
   352   $ hg -R sub qnew sub0.diff
   360   $ echo sub = sub >> .hgsub
   353   $ echo sub = sub >> .hgsub
   361   $ hg add .hgsub
   354   $ hg add .hgsub
   362   $ hg qnew 0.diff
   355   $ hg qnew 0.diff
   363   committing subrepository sub