tests/test-exchange-obsmarkers-case-A3.t
branchmercurial-4.4
changeset 4363 a2fdbece7ce1
parent 4206 04aeaec6ec07
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
    72   $ hg update -q 0
    72   $ hg update -q 0
    73   $ mkcommit B1
    73   $ mkcommit B1
    74   created new head
    74   created new head
    75   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
    75   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
    76   obsoleted 1 changesets
    76   obsoleted 1 changesets
    77   1 new orphan changesets
       
    78   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
    77   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
    79   obsoleted 1 changesets
    78   obsoleted 1 changesets
    80   $ hg log -G --hidden
    79   $ hg log -G --hidden
    81   @  f6298a8ac3a4 (draft): B1
    80   @  f6298a8ac3a4 (draft): B1
    82   |
    81   |
   177   $ hg update -q 0
   176   $ hg update -q 0
   178   $ mkcommit B1
   177   $ mkcommit B1
   179   created new head
   178   created new head
   180   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   179   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   181   obsoleted 1 changesets
   180   obsoleted 1 changesets
   182   1 new orphan changesets
       
   183   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
   181   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
   184   obsoleted 1 changesets
   182   obsoleted 1 changesets
   185   $ hg log -G --hidden
   183   $ hg log -G --hidden
   186   @  f6298a8ac3a4 (draft): B1
   184   @  f6298a8ac3a4 (draft): B1
   187   |
   185   |
   248   remote: adding manifests
   246   remote: adding manifests
   249   remote: adding file changes
   247   remote: adding file changes
   250   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   248   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   251   remote: 1 new obsolescence markers
   249   remote: 1 new obsolescence markers
   252   remote: obsoleted 1 changesets
   250   remote: obsoleted 1 changesets
   253   remote: 1 new orphan changesets
       
   254   ## post push state
   251   ## post push state
   255   # obstore: main
   252   # obstore: main
   256   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   253   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   257   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   254   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   258   # obstore: pushdest
   255   # obstore: pushdest
   265   adding manifests
   262   adding manifests
   266   adding file changes
   263   adding file changes
   267   added 1 changesets with 1 changes to 1 files (+1 heads)
   264   added 1 changesets with 1 changes to 1 files (+1 heads)
   268   1 new obsolescence markers
   265   1 new obsolescence markers
   269   obsoleted 1 changesets
   266   obsoleted 1 changesets
   270   1 new orphan changesets
       
   271   new changesets e5ea8f9c7314
   267   new changesets e5ea8f9c7314
   272   (run 'hg heads' to see heads, 'hg merge' to merge)
   268   (run 'hg heads' to see heads, 'hg merge' to merge)
   273   ## post pull state
   269   ## post pull state
   274   # obstore: main
   270   # obstore: main
   275   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   271   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}