tests/test-rebase-obsolete.t
changeset 40864 09680349cc2d
parent 40042 208303a8172c
child 40865 4edd427f34c1
equal deleted inserted replaced
40863:443eb4bc41af 40864:09680349cc2d
   127   $ hg graft 42ccdea3bb16 32af7686d403
   127   $ hg graft 42ccdea3bb16 32af7686d403
   128   grafting 1:42ccdea3bb16 "B"
   128   grafting 1:42ccdea3bb16 "B"
   129   grafting 3:32af7686d403 "D"
   129   grafting 3:32af7686d403 "D"
   130   $ hg rebase  -s 42ccdea3bb16 -d .
   130   $ hg rebase  -s 42ccdea3bb16 -d .
   131   rebasing 1:42ccdea3bb16 "B"
   131   rebasing 1:42ccdea3bb16 "B"
   132   note: rebase of 1:42ccdea3bb16 created no changes to commit
   132   note: rebase of 1:42ccdea3bb16 "B" created no changes to commit
   133   rebasing 2:5fddd98957c8 "C"
   133   rebasing 2:5fddd98957c8 "C"
   134   rebasing 3:32af7686d403 "D"
   134   rebasing 3:32af7686d403 "D"
   135   note: rebase of 3:32af7686d403 created no changes to commit
   135   note: rebase of 3:32af7686d403 "D" created no changes to commit
   136   $ hg log -G
   136   $ hg log -G
   137   o  10:5ae4c968c6ac C
   137   o  10:5ae4c968c6ac C
   138   |
   138   |
   139   @  9:08483444fef9 D
   139   @  9:08483444fef9 D
   140   |
   140   |
  1454 
  1454 
  1455   $ hg rebase -d C -b F
  1455   $ hg rebase -d C -b F
  1456   rebasing 2:b18e25de2cf5 "D" (D)
  1456   rebasing 2:b18e25de2cf5 "D" (D)
  1457   note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
  1457   note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
  1458   rebasing 5:66f1a38021c9 "F" (F tip)
  1458   rebasing 5:66f1a38021c9 "F" (F tip)
  1459   note: rebase of 5:66f1a38021c9 created no changes to commit
  1459   note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit
  1460   $ hg log -G
  1460   $ hg log -G
  1461   o  6:8f47515dda15 D
  1461   o  6:8f47515dda15 D
  1462   |
  1462   |
  1463   | x    5:66f1a38021c9 F (pruned using rebase)
  1463   | x    5:66f1a38021c9 F (pruned using rebase)
  1464   | |\
  1464   | |\
  1490 
  1490 
  1491   $ hg rebase -d C -b F
  1491   $ hg rebase -d C -b F
  1492   note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
  1492   note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
  1493   rebasing 3:7fb047a69f22 "E" (E)
  1493   rebasing 3:7fb047a69f22 "E" (E)
  1494   rebasing 5:66f1a38021c9 "F" (F tip)
  1494   rebasing 5:66f1a38021c9 "F" (F tip)
  1495   note: rebase of 5:66f1a38021c9 created no changes to commit
  1495   note: rebase of 5:66f1a38021c9 "F" (F tip) created no changes to commit
  1496 
  1496 
  1497   $ hg log -G
  1497   $ hg log -G
  1498   o  6:533690786a86 E
  1498   o  6:533690786a86 E
  1499   |
  1499   |
  1500   | x    5:66f1a38021c9 F (pruned using rebase)
  1500   | x    5:66f1a38021c9 F (pruned using rebase)