tests/test-obsolete-divergent.t
changeset 18382 f3b21beb9802
parent 18365 4148414da120
child 18644 3e92772d5383
equal deleted inserted replaced
18381:7ac4449f0f39 18382:f3b21beb9802
    60 A_1 have two direct and divergent successors A_1 and A_1
    60 A_1 have two direct and divergent successors A_1 and A_1
    61 
    61 
    62   $ newcase direct
    62   $ newcase direct
    63   $ hg debugobsolete `getid A_0` `getid A_1`
    63   $ hg debugobsolete `getid A_0` `getid A_1`
    64   $ hg debugobsolete `getid A_0` `getid A_2`
    64   $ hg debugobsolete `getid A_0` `getid A_2`
    65   invalid branchheads cache (unserved): tip differs
    65   invalid branchheads cache (served): tip differs
    66   $ hg log -G --hidden
    66   $ hg log -G --hidden
    67   o  3:392fd25390da A_2
    67   o  3:392fd25390da A_2
    68   |
    68   |
    69   | o  2:82623d38b9ba A_1
    69   | o  2:82623d38b9ba A_1
    70   |/
    70   |/
   102 -------------------------------------------
   102 -------------------------------------------
   103 
   103 
   104   $ newcase indirect_known
   104   $ newcase indirect_known
   105   $ hg debugobsolete `getid A_0` `getid A_1`
   105   $ hg debugobsolete `getid A_0` `getid A_1`
   106   $ hg debugobsolete `getid A_0` `getid A_2`
   106   $ hg debugobsolete `getid A_0` `getid A_2`
   107   invalid branchheads cache (unserved): tip differs
   107   invalid branchheads cache (served): tip differs
   108   $ mkcommit A_3
   108   $ mkcommit A_3
   109   created new head
   109   created new head
   110   $ hg debugobsolete `getid A_2` `getid A_3`
   110   $ hg debugobsolete `getid A_2` `getid A_3`
   111   $ hg log -G --hidden
   111   $ hg log -G --hidden
   112   @  4:01f36c5a8fda A_3
   112   @  4:01f36c5a8fda A_3
   141 -------------------------------------------
   141 -------------------------------------------
   142 
   142 
   143   $ newcase indirect_unknown
   143   $ newcase indirect_unknown
   144   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   144   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   145   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
   145   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
   146   invalid branchheads cache (unserved): tip differs
   146   invalid branchheads cache (served): tip differs
   147   $ hg debugobsolete `getid A_0` `getid A_2`
   147   $ hg debugobsolete `getid A_0` `getid A_2`
   148   $ hg log -G --hidden
   148   $ hg log -G --hidden
   149   o  3:392fd25390da A_2
   149   o  3:392fd25390da A_2
   150   |
   150   |
   151   | o  2:82623d38b9ba A_1
   151   | o  2:82623d38b9ba A_1
   173 -----------------------------------------------------
   173 -----------------------------------------------------
   174 
   174 
   175   $ newcase final-unknown
   175   $ newcase final-unknown
   176   $ hg debugobsolete `getid A_0` `getid A_1`
   176   $ hg debugobsolete `getid A_0` `getid A_1`
   177   $ hg debugobsolete `getid A_1` `getid A_2`
   177   $ hg debugobsolete `getid A_1` `getid A_2`
   178   invalid branchheads cache (unserved): tip differs
   178   invalid branchheads cache (served): tip differs
   179   $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   179   $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   180   $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
   180   $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
   181   $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
   181   $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
   182 
   182 
   183   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   183   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   190 -----------------------------------------------------
   190 -----------------------------------------------------
   191 
   191 
   192   $ newcase converged_divergence
   192   $ newcase converged_divergence
   193   $ hg debugobsolete `getid A_0` `getid A_1`
   193   $ hg debugobsolete `getid A_0` `getid A_1`
   194   $ hg debugobsolete `getid A_0` `getid A_2`
   194   $ hg debugobsolete `getid A_0` `getid A_2`
   195   invalid branchheads cache (unserved): tip differs
   195   invalid branchheads cache (served): tip differs
   196   $ mkcommit A_3
   196   $ mkcommit A_3
   197   created new head
   197   created new head
   198   $ hg debugobsolete `getid A_1` `getid A_3`
   198   $ hg debugobsolete `getid A_1` `getid A_3`
   199   $ hg debugobsolete `getid A_2` `getid A_3`
   199   $ hg debugobsolete `getid A_2` `getid A_3`
   200   $ hg log -G --hidden
   200   $ hg log -G --hidden
   437 successors-set. (report [A,B] not [A] + [A,B])
   437 successors-set. (report [A,B] not [A] + [A,B])
   438 
   438 
   439   $ newcase subset
   439   $ newcase subset
   440   $ hg debugobsolete `getid A_0` `getid A_2`
   440   $ hg debugobsolete `getid A_0` `getid A_2`
   441   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
   441   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
   442   invalid branchheads cache (unserved): tip differs
   442   invalid branchheads cache (served): tip differs
   443   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   443   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   444   007dc284c1f8
   444   007dc284c1f8
   445       82623d38b9ba 392fd25390da
   445       82623d38b9ba 392fd25390da
   446 
   446 
   447   $ cd ..
   447   $ cd ..