tests/test-touch.t
branchmercurial-4.6
changeset 4772 c6fc1000af1e
parent 4673 3ef4980353af
parent 4728 ef8907df73fc
child 4784 ecf0f3bc7468
equal deleted inserted replaced
4673:3ef4980353af 4772:c6fc1000af1e
   168   $ hg touch 2
   168   $ hg touch 2
   169   abort: cannot touch public changesets: * (glob)
   169   abort: cannot touch public changesets: * (glob)
   170   (see 'hg help phases' for details)
   170   (see 'hg help phases' for details)
   171   [255]
   171   [255]
   172   $ hg touch --duplicate 2
   172   $ hg touch --duplicate 2
       
   173 
       
   174   $ cd ..
       
   175 
       
   176 Make sure touch doesn't fail to warn about divergence (issue6107)
       
   177 
       
   178   $ hg init touchdiv
       
   179   $ cd touchdiv
       
   180   $ echo c > c
       
   181   $ hg add c
       
   182   $ hg ci -m "added c"
       
   183 
       
   184   $ hg amend -m "modified c"
       
   185   $ hg prune . -q
       
   186 
       
   187   $ hg touch -r "desc('added c')" --hidden
       
   188   $ hg touch -r "desc('modified c')" --hidden
       
   189   [1] modified c
       
   190   reviving this changeset will create divergence unless you make a duplicate.
       
   191   (a)llow divergence or (d)uplicate the changeset?  a
       
   192   2 new content-divergent changesets
       
   193 
       
   194   $ cd ..