50   [255]

    50   [255]

    51   $ hg debugobsolete '00'

    51   $ hg debugobsolete '00'

    52   abort: changeset references must be full hexadecimal node identifiers

    52   abort: changeset references must be full hexadecimal node identifiers

    53   [255]

    53   [255]

    54   $ hg debugobsolete -d '0 0' `getid kill_me` -u babar

    54   $ hg debugobsolete -d '0 0' `getid kill_me` -u babar

    55   obsoleted 1 changesets

    56   obsoleted 1 changesets

    56   $ hg debugobsolete

    57   $ hg debugobsolete

    57   97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}

    58   97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}

    58 

    59 

    59 (test that mercurial is not confused)

    60 (test that mercurial is not confused)

    86   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    87   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    87   $ mkcommit new_c

    88   $ mkcommit new_c

    88   created new head

    89   created new head

    89   $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden

    90   $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden

    90   $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c`  `getid new_c` -d '121 120'

    91   $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c`  `getid new_c` -d '121 120'

    91   obsoleted 1 changesets

    93   obsoleted 1 changesets

    92   $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden

    94   $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden

    93   2:245bde4270cd add original_c

    95   2:245bde4270cd add original_c

    94   $ hg debugrevlog -cd

    96   $ hg debugrevlog -cd

    95   # rev p1rev p2rev start   end deltastart base   p1   p2 rawsize totalsize compression heads chainlen

    97   # rev p1rev p2rev start   end deltastart base   p1   p2 rawsize totalsize compression heads chainlen

   110   $ hg up '.^'

   112   $ hg up '.^'

   111   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

   113   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

   112   $ mkcommit new_2_c

   114   $ mkcommit new_2_c

   113   created new head

   115   created new head

   114   $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`

   116   $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`

   115   obsoleted 1 changesets

   118   obsoleted 1 changesets

   116   $ hg debugobsolete

   119   $ hg debugobsolete

   117   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}

   120   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}

   118   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}

   121   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}

   119 

   122 

   122   $ hg up '.^'

   125   $ hg up '.^'

   123   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

   126   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

   124   $ mkcommit new_3_c

   127   $ mkcommit new_3_c

   125   created new head

   128   created new head

   126   $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337

   129   $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337

   127   obsoleted 1 changesets

   131   obsoleted 1 changesets

   128   $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`

   132   $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`

   129   $ hg debugobsolete

   134   $ hg debugobsolete

   130   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}

   135   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}

   131   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}

   136   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}

   132   ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

   137   ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

   133   1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}

   138   1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}

   262   $ hg revert -ar 5

   267   $ hg revert -ar 5

   263   adding new_3_c

   268   adding new_3_c

   264   $ hg ci -m 'add n3w_3_c'

   269   $ hg ci -m 'add n3w_3_c'

   265   created new head

   270   created new head

   266   $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`

   271   $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`

   267   obsoleted 1 changesets

   273   obsoleted 1 changesets

   268   $ hg log -r 'phasedivergent()'

   274   $ hg log -r 'phasedivergent()'

   269   $ hg log -G

   275   $ hg log -G

   270   @  6:6f9641995072 (draft) [tip ] add n3w_3_c

   276   @  6:6f9641995072 (draft) [tip ] add n3w_3_c

   271   |

   277   |

   321   $ cd rev0hidden

   327   $ cd rev0hidden

   322 

   328 

   323   $ mkcommit kill0

   329   $ mkcommit kill0

   324   $ hg up -q null

   330   $ hg up -q null

   325   $ hg debugobsolete `getid kill0`

   331   $ hg debugobsolete `getid kill0`

   326   obsoleted 1 changesets

   333   obsoleted 1 changesets

   327   $ mkcommit a

   334   $ mkcommit a

   328   $ mkcommit b

   335   $ mkcommit b

   329 

   336 

   330 Should pick the first visible revision as "repo" node

   337 Should pick the first visible revision as "repo" node

   347   $ cd transaction-summary

   354   $ cd transaction-summary

   348   $ mkcommit a

   355   $ mkcommit a

   349   $ mkcommit b

   356   $ mkcommit b

   350   $ hg up -q null

   357   $ hg up -q null

   351   $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`

   358   $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`

   352   obsoleted 1 changesets

   360   obsoleted 1 changesets

   353   $ cd ..

   361   $ cd ..

   354 

   362 

   355 Exchange Test

   363 Exchange Test

   356 ============================

   364 ============================

   390   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}

   398   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}

   391 

   399 

   392 Rollback//Transaction support

   400 Rollback//Transaction support

   393 

   401 

   394   $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb

   402   $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb

   395   $ hg debugobsolete

   404   $ hg debugobsolete

   396   1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}

   405   1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}

   397   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}

   406   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}

   398   5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

   407   5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

   399   ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

   408   ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

   476 On pull

   485 On pull

   477 

   486 

   478   $ hg init tmpe

   487   $ hg init tmpe

   479   $ cd tmpe

   488   $ cd tmpe

   480   $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00

   489   $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00

   481   $ hg pull ../tmpb

   491   $ hg pull ../tmpb

   482   pulling from ../tmpb

   492   pulling from ../tmpb

   483   requesting all changes

   493   requesting all changes

   484   adding changesets

   494   adding changesets

   485   adding manifests

   495   adding manifests

   529   $ hg up 'desc("n3w_3_c")'

   539   $ hg up 'desc("n3w_3_c")'

   530   3 files updated, 0 files merged, 0 files removed, 0 files unresolved

   540   3 files updated, 0 files merged, 0 files removed, 0 files unresolved

   531   $ mkcommit original_d

   541   $ mkcommit original_d

   532   $ mkcommit original_e

   542   $ mkcommit original_e

   533   $ hg debugobsolete --record-parents `getid original_d` -d '0 0'

   543   $ hg debugobsolete --record-parents `getid original_d` -d '0 0'

   534   obsoleted 1 changesets

   545   obsoleted 1 changesets

   535   1 new orphan changesets

   546   1 new orphan changesets

   536   $ hg debugobsolete | grep `getid original_d`

   547   $ hg debugobsolete | grep `getid original_d`

   537   94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   548   94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

   538   $ hg log -r 'obsolete()'

   549   $ hg log -r 'obsolete()'

   625   $ hg up -q 'desc(n3w_3_c)'

   636   $ hg up -q 'desc(n3w_3_c)'

   626   $ mkcommit obsolete_e

   637   $ mkcommit obsolete_e

   627   created new head

   638   created new head

   628   $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \

   639   $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \

   629   > -u 'test <test@example.net>'

   640   > -u 'test <test@example.net>'

   630   obsoleted 1 changesets

   642   obsoleted 1 changesets

   631   $ hg outgoing ../tmpf # parasite hg outgoing testin

   643   $ hg outgoing ../tmpf # parasite hg outgoing testin

   632   comparing with ../tmpf

   644   comparing with ../tmpf

   633   searching for changes

   645   searching for changes

   634   6:3de5eca88c00 (draft) [tip ] add obsolete_e

   646   6:3de5eca88c00 (draft) [tip ] add obsolete_e

   810   (run 'hg heads .' to see heads, 'hg merge' to merge)

   822   (run 'hg heads .' to see heads, 'hg merge' to merge)

   811   $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;

   823   $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;

   812   > do

   824   > do

   813   >    hg debugobsolete $node

   825   >    hg debugobsolete $node

   814   > done

   826   > done

   874   obsoleted 1 changesets

   946   obsoleted 1 changesets

   875   $ hg up tip

   947   $ hg up tip

   876   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   948   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

   877 

   949 

   878 #if serve

   950 #if serve

   936 #endif

  1008 #endif

   937 

  1009 

   938 Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset)

  1010 Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset)

   939 

  1011 

   940   $ hg debugobsolete `getid obsolete_e`

  1012   $ hg debugobsolete `getid obsolete_e`

   941   obsoleted 1 changesets

  1014   obsoleted 1 changesets

   942   2 new orphan changesets

  1015   2 new orphan changesets

   943   $ hg debugobsolete `getid original_c` `getid babar`

  1016   $ hg debugobsolete `getid original_c` `getid babar`

   944   1 new phase-divergent changesets

  1018   1 new phase-divergent changesets

   945   2 new content-divergent changesets

  1019   2 new content-divergent changesets

   946   $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()'

  1020   $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()'

   947   changeset:   7:50c51b361e60

  1021   changeset:   7:50c51b361e60

   948   user:        test

  1022   user:        test

  1307   1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  1381   1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  1308   $ hg graft 1

  1382   $ hg graft 1

  1309   grafting 1:1c9eddb02162 "content-1" (tip)

  1383   grafting 1:1c9eddb02162 "content-1" (tip)

  1310 

  1384 

  1311   $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`

  1385   $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`

  1312   obsoleted 1 changesets

  1387   obsoleted 1 changesets

  1313 

  1388 

  1314   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

  1389   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

  1315   $ cat hg.pid >> $DAEMON_PIDS

  1390   $ cat hg.pid >> $DAEMON_PIDS

  1316 

  1391 

  1608   $ getid .

  1683   $ getid .

  1609   $ hg --config extensions.strip= strip -r .

  1684   $ hg --config extensions.strip= strip -r .

  1610   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  1685   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  1611   saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg

  1686   saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg

  1612   $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b

  1687   $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b

  1613   $ hg unbundle ../bundle-2.hg

  1689   $ hg unbundle ../bundle-2.hg

  1614   adding changesets

  1690   adding changesets

  1615   adding manifests

  1691   adding manifests

  1616   adding file changes

  1692   adding file changes

  1617   added 1 changesets with 1 changes to 1 files

  1693   added 1 changesets with 1 changes to 1 files