[mb-commits] branch, beta, updated. Try fixing the edit ID conflict a different way

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2fef60954ef27b4e1c1e3d2dba8402f4d978ae71 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b771aee23fa66a37dca265f23b28097faeca1c56 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=eb08bdd9d0391058f9c9768bb64500d69ac7ee0e (commit)

Summary of changes:
 t/sql/statistics.sql |   10 +++++-----
 t/sql/webservice.sql |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2fef60954ef27b4e1c1e3d2dba8402f4d978ae71
Author: Ian McEwen <[email protected]>
Date:   Mon Jan 14 21:14:35 2013 -0700

    Try fixing the edit ID conflict a different way

diff --git a/t/sql/statistics.sql b/t/sql/statistics.sql
index 10e63e8..3599141 100644
--- a/t/sql/statistics.sql
+++ b/t/sql/statistics.sql
@@ -11,19 +11,19 @@ INSERT INTO editor (id, name, password, privs, email, website, bio, member_since
         'donation check test user', '2010-03-25', '2010-03-25', '2010-03-25', 0, 0, 0, 0);
 
 INSERT INTO edit (id, editor, type, status, data, expire_time)
-    VALUES (1, 1, 123, 1, '{ "key": "value" }', NOW());
+    VALUES (2, 1, 123, 1, '{ "key": "value" }', NOW());
 
 INSERT INTO edit (id, editor, type, status, data, expire_time)
-    VALUES (2, 2, 123, 1, '{ "key": "value" }', NOW());
+    VALUES (3, 2, 123, 1, '{ "key": "value" }', NOW());
 
 INSERT INTO edit (id, editor, type, status, data, expire_time)
-    VALUES (3, 1, 123, 1, '{ "key": "value" }', NOW());
+    VALUES (4, 1, 123, 1, '{ "key": "value" }', NOW());
 
 INSERT INTO edit (id, editor, type, status, data, expire_time)
-    VALUES (4, 2, 123, 2, '{ "key": "value" }', NOW());
+    VALUES (5, 2, 123, 2, '{ "key": "value" }', NOW());
 
 INSERT INTO edit (id, editor, type, status, data, expire_time)
-    VALUES (5, 3, 123, 1, '{ "key": "value" }', NOW());
+    VALUES (6, 3, 123, 1, '{ "key": "value" }', NOW());
 
 INSERT INTO artist_name (id, name) VALUES (1, 'artist');
 INSERT INTO artist (id, gid, name, sort_name, comment)

commit b771aee23fa66a37dca265f23b28097faeca1c56
Author: Ian McEwen <[email protected]>
Date:   Mon Jan 14 21:13:44 2013 -0700

    Revert "Change edit ID number in webservice.sql, conflicting with statistics.sql"
    
    This reverts commit eb08bdd9d0391058f9c9768bb64500d69ac7ee0e.

diff --git a/t/sql/webservice.sql b/t/sql/webservice.sql
index 0c6dd55..c0a69a4 100644
--- a/t/sql/webservice.sql
+++ b/t/sql/webservice.sql
@@ -503,8 +503,8 @@ INSERT INTO artist_credit_name (join_phrase, artist, name, position, artist_cred
 INSERT INTO release_group (last_updated, comment, name, edits_pending, type, artist_credit, id, gid) VALUES ('2009-05-24 20:47:00.490177+00', '', 346153, 0, 2, 135345, 403214, '153f0a09-fead-3370-9b17-379ebd09446b');
 INSERT INTO release (date_day, status, release_group, edits_pending, packaging, id, quality, country, last_updated, script, language, name, artist_credit, barcode, comment, date_year, date_month, gid) VALUES (17, 1, 403214, 0, NULL, 59662, -1, 107, '2009-08-17 08:23:42.424855+00', 28, 120, 346153, 135345, '4988064451180', '', 2004, 3, 'aff4a693-5970-4e2e-bd46-e2ee49c22de7');
 INSERT INTO editor (id, name, password) VALUES (95821, 'the-anti-kuno', 'notreally');
-INSERT INTO edit (id, editor, type, status, data, expire_time) VALUES (10, 95821, 314, 2, '{}', now() + INTERVAL '2 weeks');
-INSERT INTO cover_art_archive.cover_art (id, release, comment, edit, ordering, date_uploaded, edits_pending) VALUES (1031598329, 59662, '', 10, 1, '2012-05-24 07:35:13.984115+00', 0);
+INSERT INTO edit (id, editor, type, status, data, expire_time) VALUES (1, 95821, 314, 2, '{}', now() + INTERVAL '2 weeks');
+INSERT INTO cover_art_archive.cover_art (id, release, comment, edit, ordering, date_uploaded, edits_pending) VALUES (1031598329, 59662, '', 1, 1, '2012-05-24 07:35:13.984115+00', 0);
 INSERT INTO cover_art_archive.art_type (id, name) VALUES (1, 'Front');
 INSERT INTO cover_art_archive.cover_art_type (id, type_id) VALUES (1031598329, 1);
 INSERT INTO tracklist (last_updated, track_count, id) VALUES ('2011-01-18 15:21:33.71184+00', 0, 403214);

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server