tests/test-obsolete-divergent.t
changeset 34850 62a4ccf9784a
parent 34847 e27f1f04c2cf
child 34851 6f53a53245a2
equal deleted inserted replaced
34849:9f2891fb426c 34850:62a4ccf9784a
    64   $ hg log -G --hidden
    64   $ hg log -G --hidden
    65   o  3:392fd25390da A_2
    65   o  3:392fd25390da A_2
    66   |
    66   |
    67   | o  2:82623d38b9ba A_1
    67   | o  2:82623d38b9ba A_1
    68   |/
    68   |/
    69   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
    69   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)]
    70   |/
    70   |/
    71   @  0:d20a80d4def3 base
    71   @  0:d20a80d4def3 base
    72   
    72   
    73   $ hg debugsuccessorssets --hidden 'all()'
    73   $ hg debugsuccessorssets --hidden 'all()'
    74   d20a80d4def3
    74   d20a80d4def3
   125   $ hg debugobsolete `getid A_2` `getid A_3`
   125   $ hg debugobsolete `getid A_2` `getid A_3`
   126   obsoleted 1 changesets
   126   obsoleted 1 changesets
   127   $ hg log -G --hidden
   127   $ hg log -G --hidden
   128   @  4:01f36c5a8fda A_3
   128   @  4:01f36c5a8fda A_3
   129   |
   129   |
   130   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)]
   130   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)]
   131   |/
   131   |/
   132   | o  2:82623d38b9ba A_1
   132   | o  2:82623d38b9ba A_1
   133   |/
   133   |/
   134   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   134   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   135   |/
   135   |/
   136   o  0:d20a80d4def3 base
   136   o  0:d20a80d4def3 base
   137   
   137   
   138   $ hg debugsuccessorssets --hidden 'all()'
   138   $ hg debugsuccessorssets --hidden 'all()'
   139   d20a80d4def3
   139   d20a80d4def3
   183   $ hg log -G --hidden
   183   $ hg log -G --hidden
   184   o  3:392fd25390da A_2
   184   o  3:392fd25390da A_2
   185   |
   185   |
   186   | o  2:82623d38b9ba A_1
   186   | o  2:82623d38b9ba A_1
   187   |/
   187   |/
   188   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   188   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   189   |/
   189   |/
   190   @  0:d20a80d4def3 base
   190   @  0:d20a80d4def3 base
   191   
   191   
   192   $ hg debugsuccessorssets --hidden 'all()'
   192   $ hg debugsuccessorssets --hidden 'all()'
   193   d20a80d4def3
   193   d20a80d4def3
   257   $ hg debugobsolete `getid A_2` `getid A_3`
   257   $ hg debugobsolete `getid A_2` `getid A_3`
   258   obsoleted 1 changesets
   258   obsoleted 1 changesets
   259   $ hg log -G --hidden
   259   $ hg log -G --hidden
   260   @  4:01f36c5a8fda A_3
   260   @  4:01f36c5a8fda A_3
   261   |
   261   |
   262   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)]
   262   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)]
   263   |/
   263   |/
   264   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)]
   264   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)]
   265   |/
   265   |/
   266   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba by test (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   266   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba (at 1970-01-01 00:00 +0000); rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   267   |/
   267   |/
   268   o  0:d20a80d4def3 base
   268   o  0:d20a80d4def3 base
   269   
   269   
   270   $ hg debugsuccessorssets --hidden 'all()'
   270   $ hg debugsuccessorssets --hidden 'all()'
   271   d20a80d4def3
   271   d20a80d4def3
   307   $ hg log -G --hidden
   307   $ hg log -G --hidden
   308   o  3:392fd25390da A_2
   308   o  3:392fd25390da A_2
   309   |
   309   |
   310   | o  2:82623d38b9ba A_1
   310   | o  2:82623d38b9ba A_1
   311   |/
   311   |/
   312   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   312   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   313   |/
   313   |/
   314   @  0:d20a80d4def3 base
   314   @  0:d20a80d4def3 base
   315   
   315   
   316   $ hg debugsuccessorssets --hidden 'all()'
   316   $ hg debugsuccessorssets --hidden 'all()'
   317   d20a80d4def3
   317   d20a80d4def3
   359   $ hg debugobsolete `getid A_4` `getid A_5`
   359   $ hg debugobsolete `getid A_4` `getid A_5`
   360   obsoleted 1 changesets
   360   obsoleted 1 changesets
   361   $ hg log -G --hidden
   361   $ hg log -G --hidden
   362   @  6:e442cfc57690 A_5
   362   @  6:e442cfc57690 A_5
   363   |
   363   |
   364   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 by test (at 1970-01-01 00:00 +0000)]
   364   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)]
   365   |/
   365   |/
   366   | o  4:01f36c5a8fda A_3
   366   | o  4:01f36c5a8fda A_3
   367   |/
   367   |/
   368   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a by test (at 1970-01-01 00:00 +0000)]
   368   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)]
   369   |/
   369   |/
   370   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)]
   370   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)]
   371   |/
   371   |/
   372   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   372   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   373   |/
   373   |/
   374   o  0:d20a80d4def3 base
   374   o  0:d20a80d4def3 base
   375   
   375   
   376   $ hg debugsuccessorssets --hidden 'all()'
   376   $ hg debugsuccessorssets --hidden 'all()'
   377   d20a80d4def3
   377   d20a80d4def3
   435   |
   435   |
   436   | o  9:14608b260df8 A_8
   436   | o  9:14608b260df8 A_8
   437   |/
   437   |/
   438   | o  8:7ae126973a96 A_7
   438   | o  8:7ae126973a96 A_7
   439   |/
   439   |/
   440   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   440   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   441   | |
   441   | |
   442   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a by test (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 by test (at 1970-01-01 00:00 +0000)]
   442   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 (at 1970-01-01 00:00 +0000)]
   443   |/
   443   |/
   444   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 by test (at 1970-01-01 00:00 +0000)]
   444   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)]
   445   |/
   445   |/
   446   | o  4:01f36c5a8fda A_3
   446   | o  4:01f36c5a8fda A_3
   447   |/
   447   |/
   448   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a by test (at 1970-01-01 00:00 +0000)]
   448   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)]
   449   |/
   449   |/
   450   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)]
   450   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)]
   451   |/
   451   |/
   452   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   452   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   453   |/
   453   |/
   454   @  0:d20a80d4def3 base
   454   @  0:d20a80d4def3 base
   455   
   455   
   456   $ hg debugsuccessorssets --hidden 'all()'
   456   $ hg debugsuccessorssets --hidden 'all()'
   457   d20a80d4def3
   457   d20a80d4def3
   533   $ hg debugobsolete `getid A_8` `getid A_A`
   533   $ hg debugobsolete `getid A_8` `getid A_A`
   534   obsoleted 1 changesets
   534   obsoleted 1 changesets
   535   $ hg log -G --hidden
   535   $ hg log -G --hidden
   536   o  11:a139f71be9da A_A
   536   o  11:a139f71be9da A_A
   537   |
   537   |
   538   | x  10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da by test (at 1970-01-01 00:00 +0000)]
   538   | x  10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)]
   539   |/
   539   |/
   540   | x  9:14608b260df8 A_8 [rewritten as 11:a139f71be9da by test (at 1970-01-01 00:00 +0000)]
   540   | x  9:14608b260df8 A_8 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)]
   541   |/
   541   |/
   542   | x  8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da by test (at 1970-01-01 00:00 +0000)]
   542   | x  8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da (at 1970-01-01 00:00 +0000)]
   543   |/
   543   |/
   544   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   544   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   545   | |
   545   | |
   546   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a by test (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 by test (at 1970-01-01 00:00 +0000)]
   546   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a (at 1970-01-01 00:00 +0000); split as 8:7ae126973a96, 9:14608b260df8 (at 1970-01-01 00:00 +0000)]
   547   |/
   547   |/
   548   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 by test (at 1970-01-01 00:00 +0000)]
   548   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 (at 1970-01-01 00:00 +0000)]
   549   |/
   549   |/
   550   | o  4:01f36c5a8fda A_3
   550   | o  4:01f36c5a8fda A_3
   551   |/
   551   |/
   552   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a by test (at 1970-01-01 00:00 +0000)]
   552   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a (at 1970-01-01 00:00 +0000)]
   553   |/
   553   |/
   554   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda by test (at 1970-01-01 00:00 +0000)]
   554   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda (at 1970-01-01 00:00 +0000)]
   555   |/
   555   |/
   556   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da by test (at 1970-01-01 00:00 +0000)]
   556   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da (at 1970-01-01 00:00 +0000)]
   557   |/
   557   |/
   558   @  0:d20a80d4def3 base
   558   @  0:d20a80d4def3 base
   559   
   559   
   560   $ hg debugsuccessorssets --hidden 'all()'
   560   $ hg debugsuccessorssets --hidden 'all()'
   561   d20a80d4def3
   561   d20a80d4def3