tests/test-obsolete.t
branchstable
changeset 24882 995003a324da
parent 24733 c00e4338fa4b
child 25111 1ef96a3b8b89
equal deleted inserted replaced
24881:51844b8b5017 24882:995003a324da
   787   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   787   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   788   $ hg tags
   788   $ hg tags
   789   visible                            0:193e9254ce7e
   789   visible                            0:193e9254ce7e
   790   tip                                0:193e9254ce7e
   790   tip                                0:193e9254ce7e
   791 
   791 
       
   792 Test bundle overlay onto hidden revision
       
   793 
       
   794   $ cd ..
       
   795   $ hg init repo-bundleoverlay
       
   796   $ cd repo-bundleoverlay
       
   797   $ echo "A" > foo
       
   798   $ hg ci -Am "A"
       
   799   adding foo
       
   800   $ echo "B" >> foo
       
   801   $ hg ci -m "B"
       
   802   $ hg up 0
       
   803   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   804   $ echo "C" >> foo
       
   805   $ hg ci -m "C"
       
   806   created new head
       
   807   $ hg log -G
       
   808   @  2:c186d7714947 (draft) [tip ] C
       
   809   |
       
   810   | o  1:44526ebb0f98 (draft) [ ] B
       
   811   |/
       
   812   o  0:4b34ecfb0d56 (draft) [ ] A
       
   813   
       
   814 
       
   815   $ hg clone -r1 . ../other-bundleoverlay
       
   816   adding changesets
       
   817   adding manifests
       
   818   adding file changes
       
   819   added 2 changesets with 2 changes to 1 files
       
   820   updating to branch default
       
   821   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   822   $ cd ../other-bundleoverlay
       
   823   $ echo "B+" >> foo
       
   824   $ hg ci --amend -m "B+"
       
   825   $ hg log -G --hidden
       
   826   @  3:b7d587542d40 (draft) [tip ] B+
       
   827   |
       
   828   | x  2:eb95e9297e18 (draft) [ ] temporary amend commit for 44526ebb0f98
       
   829   | |
       
   830   | x  1:44526ebb0f98 (draft) [ ] B
       
   831   |/
       
   832   o  0:4b34ecfb0d56 (draft) [ ] A
       
   833   
       
   834 
       
   835   $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
       
   836   comparing with ../repo-bundleoverlay
       
   837   searching for changes
       
   838   1:44526ebb0f98 (draft) [ ] B
       
   839   2:c186d7714947 (draft) [tip ] C
       
   840   $ hg log -G -R ../bundleoverlay.hg
       
   841   o  4:c186d7714947 (draft) [tip ] C
       
   842   |
       
   843   | @  3:b7d587542d40 (draft) [ ] B+
       
   844   |/
       
   845   o  0:4b34ecfb0d56 (draft) [ ] A
       
   846   
       
   847 
   792 #if serve
   848 #if serve
   793 
   849 
   794 Test issue 4506
   850 Test issue 4506
   795 
   851 
   796   $ cd ..
   852   $ cd ..