Skip to content

M
MariaDB
Commit 65f125ff authored by unknown's avatar unknown
Browse files
Options

Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1.

parent b912f9ec
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 66 deletions
BitKeeper/triggers/pre-outgoing.crash-protect.pl
View file @ 65f125ff
...@@ -12,39 +12,7 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || ...@@ -12,39 +12,7 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' ||
print "Checking for bad changesets from old crashed 5.1 tree...\n"; print "Checking for bad changesets from old crashed 5.1 tree...\n";
my @bad_csets= my @bad_csets=
( 'msvensson@shellback.(none)|ChangeSet|20060529142745|46985', ( 'monty@mysql.com|ChangeSet|20060418090255|16983',
'msvensson@shellback.(none)|ChangeSet|20060529143332|33946',
'msvensson@shellback.(none)|ChangeSet|20060531083338|34492',
'mskold@mysql.com|ChangeSet|20060531133249|59726',
'msvensson@shellback.(none)|ChangeSet|20060531141906|46150',
'msvensson@shellback.(none)|ChangeSet|20060531142803|34535',
'msvensson@shellback.(none)|ChangeSet|20060531143208|29327',
'msvensson@shellback.(none)|ChangeSet|20060531201917|31727',
'msvensson@shellback.(none)|ChangeSet|20060531202140|30569',
'msvensson@shellback.(none)|ChangeSet|20060531210656|30302',
'msvensson@shellback.(none)|ChangeSet|20060531213650|30228',
'msvensson@devsrv-b.mysql.com|ChangeSet|20060531220152|32024',
'mskold@mysql.com|ChangeSet|20060601064347|57850',
'jonas@perch.ndb.mysql.com|ChangeSet|20060601065058|57665',
'jonas@perch.ndb.mysql.com|ChangeSet|20060601065157|32046',
'msvensson@shellback.(none)|ChangeSet|20060601103235|30886',
'jonas@perch.ndb.mysql.com|ChangeSet|20060601105712|57872',
'msvensson@shellback.(none)|ChangeSet|20060601113527|58530',
'elliot@mysql.com|ChangeSet|20060604134029|08076',
'elliot@mysql.com|ChangeSet|20060428201319|48501',
'msvensson@neptunus.(none)|ChangeSet|20060523093514|36516',
'elliot@mysql.com|ChangeSet|20060524130255|05714',
'iggy@mysql.com|ChangeSet|20060524133436|07673',
'msvensson@neptunus.(none)|ChangeSet|20060529111121|49878',
'msvensson@neptunus.(none)|ChangeSet|20060529111617|54251',
'msvensson@neptunus.(none)|ChangeSet|20060529130531|54248',
'msvensson@neptunus.(none)|ChangeSet|20060529130637|37471',
'iggy@mysql.com|ChangeSet|20060530122212|37016',
'tnurnberg@mysql.com|ChangeSet|20060531122731|36474',
'msvensson@shellback.(none)|ChangeSet|20060601103352|33933',
'cmiller@zippy.(none)|ChangeSet|20060601184744|61577',
'elliot@mysql.com|ChangeSet|20060604220244|04353',
'monty@mysql.com|ChangeSet|20060418090255|16983',
'monty@mysql.com|ChangeSet|20060418090458|02628', 'monty@mysql.com|ChangeSet|20060418090458|02628',
'monty@mysql.com|ChangeSet|20060419084236|49576', 'monty@mysql.com|ChangeSet|20060419084236|49576',
'monty@mysql.com|ChangeSet|20060503164655|51444', 'monty@mysql.com|ChangeSet|20060503164655|51444',
......
BitKeeper/triggers/pre-resolve.crash-protect.pl
View file @ 65f125ff
...@@ -12,39 +12,7 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || ...@@ -12,39 +12,7 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' ||
print "Checking for bad changesets from old crashed 5.1 tree...\n"; print "Checking for bad changesets from old crashed 5.1 tree...\n";
my @bad_csets= my @bad_csets=
( 'msvensson@shellback.(none)|ChangeSet|20060529142745|46985', ( 'monty@mysql.com|ChangeSet|20060418090255|16983',
'msvensson@shellback.(none)|ChangeSet|20060529143332|33946',
'msvensson@shellback.(none)|ChangeSet|20060531083338|34492',
'mskold@mysql.com|ChangeSet|20060531133249|59726',
'msvensson@shellback.(none)|ChangeSet|20060531141906|46150',
'msvensson@shellback.(none)|ChangeSet|20060531142803|34535',
'msvensson@shellback.(none)|ChangeSet|20060531143208|29327',
'msvensson@shellback.(none)|ChangeSet|20060531201917|31727',
'msvensson@shellback.(none)|ChangeSet|20060531202140|30569',
'msvensson@shellback.(none)|ChangeSet|20060531210656|30302',
'msvensson@shellback.(none)|ChangeSet|20060531213650|30228',
'msvensson@devsrv-b.mysql.com|ChangeSet|20060531220152|32024',
'mskold@mysql.com|ChangeSet|20060601064347|57850',
'jonas@perch.ndb.mysql.com|ChangeSet|20060601065058|57665',
'jonas@perch.ndb.mysql.com|ChangeSet|20060601065157|32046',
'msvensson@shellback.(none)|ChangeSet|20060601103235|30886',
'jonas@perch.ndb.mysql.com|ChangeSet|20060601105712|57872',
'msvensson@shellback.(none)|ChangeSet|20060601113527|58530',
'elliot@mysql.com|ChangeSet|20060604134029|08076',
'elliot@mysql.com|ChangeSet|20060428201319|48501',
'msvensson@neptunus.(none)|ChangeSet|20060523093514|36516',
'elliot@mysql.com|ChangeSet|20060524130255|05714',
'iggy@mysql.com|ChangeSet|20060524133436|07673',
'msvensson@neptunus.(none)|ChangeSet|20060529111121|49878',
'msvensson@neptunus.(none)|ChangeSet|20060529111617|54251',
'msvensson@neptunus.(none)|ChangeSet|20060529130531|54248',
'msvensson@neptunus.(none)|ChangeSet|20060529130637|37471',
'iggy@mysql.com|ChangeSet|20060530122212|37016',
'tnurnberg@mysql.com|ChangeSet|20060531122731|36474',
'msvensson@shellback.(none)|ChangeSet|20060601103352|33933',
'cmiller@zippy.(none)|ChangeSet|20060601184744|61577',
'elliot@mysql.com|ChangeSet|20060604220244|04353',
'monty@mysql.com|ChangeSet|20060418090255|16983',
'monty@mysql.com|ChangeSet|20060418090458|02628', 'monty@mysql.com|ChangeSet|20060418090458|02628',
'monty@mysql.com|ChangeSet|20060419084236|49576', 'monty@mysql.com|ChangeSet|20060419084236|49576',
'monty@mysql.com|ChangeSet|20060503164655|51444', 'monty@mysql.com|ChangeSet|20060503164655|51444',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7