tests/test-uncommit.t
branchmercurial-4.4
changeset 4516 f54bb6eaf5e6
parent 4363 a2fdbece7ce1
parent 4513 d70db7e455dc
child 4675 79bc0f1a832e
equal deleted inserted replaced
4514:ef1c322c389d 4516:f54bb6eaf5e6
   236   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
   236   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
   237 
   237 
   238 Test phase is preserved, no local changes
   238 Test phase is preserved, no local changes
   239 
   239 
   240   $ hg up -C 3 --hidden
   240   $ hg up -C 3 --hidden
   241   updating to a hidden changeset 5eb72dbe0cb4
       
   242   (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6)
       
   243   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   241   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   244   (leaving bookmark touncommit-bm)
   242   (leaving bookmark touncommit-bm)
   245   working directory parent is obsolete! (5eb72dbe0cb4)
   243   working directory parent is obsolete! (5eb72dbe0cb4)
   246   (use 'hg evolve' to update to its successor: e8db4aa611f6)
   244   (use 'hg evolve' to update to its successor: e8db4aa611f6)
   247   $ hg --config extensions.purge= purge
   245   $ hg --config extensions.purge= purge
   248   $ hg uncommit -I 'set:added() and e'
   246   $ hg uncommit -I 'set:added() and e'
   249   2 new content-divergent changesets
       
   250   $ hg st --copies
   247   $ hg st --copies
   251   A e
   248   A e
   252   $ hg st --copies --change .
   249   $ hg st --copies --change .
   253   M b
   250   M b
   254   M d
   251   M d
   268   R m
   265   R m
   269   R n
   266   R n
   270   $ glog --hidden
   267   $ glog --hidden
   271   @  5:a1d4c1ad76cc@bar(draft) touncommit
   268   @  5:a1d4c1ad76cc@bar(draft) touncommit
   272   |
   269   |
   273   | *  4:e8db4aa611f6@bar(draft) touncommit
   270   | o  4:e8db4aa611f6@bar(draft) touncommit
   274   |/
   271   |/
   275   | x  3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
   272   | x  3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
   276   |/
   273   |/
   277   o    2:f63b90038565@default(draft) merge
   274   o    2:f63b90038565@default(draft) merge
   278   |\
   275   |\
   285   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
   282   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
   286 
   283 
   287 Test --all
   284 Test --all
   288 
   285 
   289   $ hg up -C 3 --hidden
   286   $ hg up -C 3 --hidden
   290   updating to a hidden changeset 5eb72dbe0cb4
       
   291   (hidden revision '5eb72dbe0cb4' has diverged)
       
   292   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   287   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   293   working directory parent is obsolete! (5eb72dbe0cb4)
   288   working directory parent is obsolete! (5eb72dbe0cb4)
   294   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   289   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   295   $ hg --config extensions.purge= purge
   290   $ hg --config extensions.purge= purge
   296   $ hg uncommit --all -X e
   291   $ hg uncommit --all -X e
   297   1 new content-divergent changesets
       
   298   $ hg st --copies
   292   $ hg st --copies
   299   M b
   293   M b
   300   M d
   294   M d
   301   M j
   295   M j
   302   M o
   296   M o
   339   $ hg ci -Am addunrelated unrelated
   333   $ hg ci -Am addunrelated unrelated
   340   $ hg previous
   334   $ hg previous
   341   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   335   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   342   [8] touncommit
   336   [8] touncommit
   343   $ hg uncommit aa
   337   $ hg uncommit aa
   344   1 new orphan changesets
       
   345 
   338 
   346 Test uncommiting agains a different base
   339 Test uncommiting agains a different base
   347 
   340 
   348   $ hg cat b --rev .
   341   $ hg cat b --rev .
   349   b
   342   b