tests/test-touch.t
changeset 4729 076b6813a7ea
parent 4721 b69497b23d31
parent 4728 ef8907df73fc
child 4784 ecf0f3bc7468
child 5079 1f92a6aa40d6
equal deleted inserted replaced
4725:f162cafc5000 4729:076b6813a7ea
   198   |
   198   |
   199   ~
   199   ~
   200   $ hg st --change 17
   200   $ hg st --change 17
   201   A a
   201   A a
   202   A b
   202   A b
       
   203 
       
   204   $ cd ..
       
   205 
       
   206 Make sure touch doesn't fail to warn about divergence (issue6107)
       
   207 
       
   208   $ hg init touchdiv
       
   209   $ cd touchdiv
       
   210   $ echo c > c
       
   211   $ hg add c
       
   212   $ hg ci -m "added c"
       
   213 
       
   214   $ hg amend -m "modified c"
       
   215   $ hg prune . -q
       
   216 
       
   217   $ hg touch -r "desc('added c')" --hidden
       
   218   $ hg touch -r "desc('modified c')" --hidden
       
   219   [1] modified c
       
   220   reviving this changeset will create divergence unless you make a duplicate.
       
   221   (a)llow divergence or (d)uplicate the changeset?  a
       
   222   2 new content-divergent changesets
       
   223 
       
   224   $ cd ..