Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/sslcerts/client-key.pem
author Jun Wu <quark@fb.com>
Mon, 28 Nov 2016 05:45:22 +0000
changeset 30585 51e7c83e05ee
parent 29526 9d02bed8477b
permissions -rw-r--r--
rebase: calculate ancestors for --base separately (issue5420) Previously, the --base option only works with a single "branch" - if there is one changeset in the "--base" revset whose branching point(s) is/are different from another changeset in the "--base" revset, "rebase" will error out with: abort: source is ancestor of destination This happens if the user has multiple draft branches, and uses "hg rebase -b 'draft()' -d master", for example. The error message looks cryptic to users who don't know the implementation detail. This patch changes the logic to calculate the common ancestor for every "base" changeset separately so we won't (incorrectly) select "source" which is an ancestor of the destination. This patch should not change the behavior where all changesets specified by "--base" have the same branching point(s). A new situation is: some of the specified changesets could be rebased, while some couldn't (because they are descendants of the destination, or they do not share a common ancestor with the destination). The current behavior is to show "nothing to rebase" and exits with 1. This patch maintains the current behavior (show "nothing to rebase") even if part of the "--base" revset could be rebased. A clearer error message may be "cannot find branching point for X", or "X is a descendant of destination". The error message issue is tracked by issue5422 separately. A test is added with all kinds of tricky cases I could think of for now.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
29331
1e02d9576194 tests: extract SSL certificates from test-https.t
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset 
     1
 
-----BEGIN RSA PRIVATE KEY-----
1e02d9576194 tests: extract SSL certificates from test-https.t
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset 
     2
 
Proc-Type: 4,ENCRYPTED
29526
9d02bed8477b tests: regenerate x509 test certificates
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29331
diff changeset 
     3
 
DEK-Info: AES-256-CBC,ADE9D82AA8D8023CD4E9B67FECD9FE08
29331
1e02d9576194 tests: extract SSL certificates from test-https.t
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset 
     4
 







29526






9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




     5


tjMPfTx/dFicleUbh4pH4f5RUtgZwamcU/uy246wk+f2EBG7pVKEEmoXm8rWW2tW













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




     6


xlp9BjL6yCBxoB/GGPjFAoqjQmnUQMxy/P0OWqur3t0+GrB4Fw9hB82fxgnAaydF













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




     7


10fw+bRMCfxJMRfa2nEkLzL9za6TF0IOvAYYza/rCxgOQiLg/py9V29wjVnIW9Dt













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




     8


B/GxfblTv9K2JBEVdKNWIGT1ZGxem8qiXctbufIXDr+dEEoFUKh+wvkmwVhBaSXi













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




     9


gw6fAoATz0Lpd+9d0bqEC1wC3NFdxABYUjZMQ7+xtNzaSCdXiWgv4ix1kzoY8rIi













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    10


mnaSH1VdO27fzA0aOgi6/FAYCT0H3bEQIPgcA47kpty8a27OCylHZGa+vnmBnEtv













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    11


qZeO9kX3Dmoi7vzXL8vjf41ZY7eTU6kYWktdBw/gM65goGINPFx85gli3k5I7+TR













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    12


DQ1shyAmmMU9rH+YamZ9Hs4SLfAe7xPI/7i/upMsz56c57/HlvUwHr0as+L7WDZP













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    13


iX/oW2DQmwN/C5owMPttM7dg2PvSw/Blte5lvloLbmhQTzzw0MDkPHkGt+5Hhjcl













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    14


NwoaVCzT4Kg3E7fcXrKr80vYP9fOQIbCT5qtZ2/cTNLk8XYmLJm8Q7e1XqvuY9sQ













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    15


K7xQ5iLz0PjWDtgbculcb3tQIIUcf/Ss9nCakWr6r4pPIQjDVJh07L7ou76n2PVs













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    16


zJh6cJBgTEUaRWTQgGVH9euyQU3pXHLR0nk5zN4uAOVWdR7eiiskYwT3pM6HiER8













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    17


ZYTs+fJtQD9gJPhBAa3LX5L7kWADxGFdAH5qoTn1SSJY4RIVFVfRfxXmQuTGlRQB













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    18


UEh5Q3bdYKeauw3E9kBaYMYu19223XsAyuvs7/nB02DV6dFjTCGLsrv3JEgf+Wx6













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    19


biCfoOrR1Kt2ez8QR9/6TIbz36kc2Jo3m2jKqUrNx1/gLj+coklSET09IwRZ0voi













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    20


7ype+4mHFEzwiSxmugLfdnU8d9PkzFzUiu3qSYeD2DR9hBgnZtgu0fFnSCmqFDXG













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    21


H1yWy6X6Wiqx6abPVq1ODZgeTmsjJsMLDB6PUbQyESp9ICRJyPPCrMi6UpLrWMto













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    22


A764n5w8B2g/GPJfz1sPePZYi6sumd9UqTQ8UhM644oOlxPWufiBeTiPm1W73PSZ













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    23


6DmLyVEh+kcfID6xq3tWVAuiPO1jMpQGoLKXO7oxGvmTNY/Va++j22DpzNoj1hTJ













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    24


cnFOQZARKrSooAnngwUP68tGVo/+fxzWG95t7IZy8BvszP09VT1jcHOfFIZqHa/V













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    25


rI/JrWSK+tu75Ot63QQpm1x7xSctMZg71w7riVipA+8F1FBdmp+lhOQkEMytngIA













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    26


jKovkuwo8AiQvYCDspEcGSroQmOh1d5TraRyhTuRdiefLVSh05kVGCd6/UsVqdZs













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    27


j+HEyepn4/A9xpHRBTWfCwBFFktAgSdCUOLh5xsT2MbbT/0wDoneD/uay0NakWXB













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    28


zuVsaasx0Yl2cqvXKVUMphmbqMa859BNVqEK3l3tYZdvHiwT8J1LnEEK4KiBa2zZ













9d02bed8477b
tests: regenerate x509 test certificates



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
29331

diff
changeset




    29


+8FcFvD8x1NZBcCBArYP59MbCQOC2QBPJe/oCiUVhN8kRIwlwOhytbW+QIuLZHi4








29331






1e02d9576194
tests: extract SSL certificates from test-https.t



Yuya Nishihara <yuya@tcha.org>


parents: 

diff
changeset




    30


-----END RSA PRIVATE KEY-----















hg-stable