tests/test-rebase-obsolete.t
changeset 17615 9e2dc0d292cd
parent 17613 aafc521668d8
child 18164 bacf55bd8f90
equal deleted inserted replaced
17614:d417986e5e05 17615:9e2dc0d292cd
   220   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob)
   220   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob)
   221   32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob)
   221   32af7686d403cf45b5d95f2d70cebea587ac806a 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob)
   222 
   222 
   223   $ cd ..
   223   $ cd ..
   224 
   224 
       
   225 Rebase set has hidden descendants
       
   226 ---------------------------------
       
   227 
       
   228 We rebase a changeset which has a hidden changeset. The hidden changeset must
       
   229 not be rebased.
       
   230 
       
   231   $ hg clone base hidden
       
   232   updating to branch default
       
   233   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   234   $ cd hidden
       
   235   $ hg rebase -s 5fddd98957c8 -d eea13746799a
       
   236   $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe
       
   237   $ hg log -G
       
   238   @  10:7c6027df6a99 B
       
   239   |
       
   240   | o  9:cf44d2f5a9f4 D
       
   241   | |
       
   242   | o  8:e273c5e7d2d2 C
       
   243   | |
       
   244   o |  7:02de42196ebe H
       
   245   | |
       
   246   | o  6:eea13746799a G
       
   247   |/|
       
   248   o |  5:24b6387c8c8c F
       
   249   | |
       
   250   | o  4:9520eea781bc E
       
   251   |/
       
   252   o  0:cd010b8cd998 A
       
   253   
       
   254   $ hg log --hidden -G
       
   255   @  10:7c6027df6a99 B
       
   256   |
       
   257   | o  9:cf44d2f5a9f4 D
       
   258   | |
       
   259   | o  8:e273c5e7d2d2 C
       
   260   | |
       
   261   o |  7:02de42196ebe H
       
   262   | |
       
   263   | o  6:eea13746799a G
       
   264   |/|
       
   265   o |  5:24b6387c8c8c F
       
   266   | |
       
   267   | o  4:9520eea781bc E
       
   268   |/
       
   269   | x  3:32af7686d403 D
       
   270   | |
       
   271   | x  2:5fddd98957c8 C
       
   272   | |
       
   273   | x  1:42ccdea3bb16 B
       
   274   |/
       
   275   o  0:cd010b8cd998 A
       
   276   
       
   277   $ hg debugobsolete
       
   278   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 {'date': '*', 'user': 'test'} (glob)
       
   279   32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob)
       
   280   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob)
       
   281 
       
   282   $ cd ..