tests/test-obsolete-divergent.t
changeset 35508 9b3f95d9783d
parent 34961 a7e49a5b3e6f
child 35709 1a09dad8b85a
equal deleted inserted replaced
35507:95a9be56c3bb 35508:9b3f95d9783d
    60   $ newcase direct
    60   $ newcase direct
    61   $ hg debugobsolete `getid A_0` `getid A_1`
    61   $ hg debugobsolete `getid A_0` `getid A_1`
    62   obsoleted 1 changesets
    62   obsoleted 1 changesets
    63   $ hg debugobsolete `getid A_0` `getid A_2`
    63   $ hg debugobsolete `getid A_0` `getid A_2`
    64   $ hg log -G --hidden
    64   $ hg log -G --hidden
    65   o  3:392fd25390da A_2
    65   *  3:392fd25390da A_2
    66   |
    66   |
    67   | o  2:82623d38b9ba A_1
    67   | *  2:82623d38b9ba A_1
    68   |/
    68   |/
    69   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
    69   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
    70   |/
    70   |/
    71   @  0:d20a80d4def3 base
    71   @  0:d20a80d4def3 base
    72   
    72   
   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]
   130   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
   131   |/
   131   |/
   132   | o  2:82623d38b9ba A_1
   132   | *  2:82623d38b9ba A_1
   133   |/
   133   |/
   134   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   134   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   135   |/
   135   |/
   136   o  0:d20a80d4def3 base
   136   o  0:d20a80d4def3 base
   137   
   137   
   179   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   179   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   180   obsoleted 1 changesets
   180   obsoleted 1 changesets
   181   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
   181   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
   182   $ hg debugobsolete `getid A_0` `getid A_2`
   182   $ hg debugobsolete `getid A_0` `getid A_2`
   183   $ hg log -G --hidden
   183   $ hg log -G --hidden
   184   o  3:392fd25390da A_2
   184   *  3:392fd25390da A_2
   185   |
   185   |
   186   | o  2:82623d38b9ba A_1
   186   | *  2:82623d38b9ba A_1
   187   |/
   187   |/
   188   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   188   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   189   |/
   189   |/
   190   @  0:d20a80d4def3 base
   190   @  0:d20a80d4def3 base
   191   
   191   
   429   $ mkcommit A_9; hg up 0
   429   $ mkcommit A_9; hg up 0
   430   created new head
   430   created new head
   431   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   431   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   432   $ hg debugobsolete `getid A_5` `getid A_9`
   432   $ hg debugobsolete `getid A_5` `getid A_9`
   433   $ hg log -G --hidden
   433   $ hg log -G --hidden
   434   o  10:bed64f5d2f5a A_9
   434   *  10:bed64f5d2f5a A_9
   435   |
   435   |
   436   | o  9:14608b260df8 A_8
   436   | *  9:14608b260df8 A_8
   437   |/
   437   |/
   438   | o  8:7ae126973a96 A_7
   438   | *  8:7ae126973a96 A_7
   439   |/
   439   |/
   440   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
   440   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
   441   | |
   441   | |
   442   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8]
   442   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8]
   443   |/
   443   |/
   444   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
   444   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
   445   |/
   445   |/
   446   | o  4:01f36c5a8fda A_3
   446   | *  4:01f36c5a8fda A_3
   447   |/
   447   |/
   448   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
   448   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
   449   |/
   449   |/
   450   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
   450   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
   451   |/
   451   |/
   671   $ rm .hg/localtags
   671   $ rm .hg/localtags
   672   $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
   672   $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
   673   $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
   673   $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
   674   @  5:1a2a9b5b0030 B2 content-divergent
   674   @  5:1a2a9b5b0030 B2 content-divergent
   675   |
   675   |
   676   | o  4:70d5a63ca112 B4 content-divergent
   676   | *  4:70d5a63ca112 B4 content-divergent
   677   | |
   677   | |
   678   | o  1:48b9aae0607f Z
   678   | o  1:48b9aae0607f Z
   679   |
   679   |
   680   o  0:426bada5c675 A
   680   o  0:426bada5c675 A
   681   
   681