diff viewer does not work after GitLab update, reviewboard version 1.7.27

2016-04-05 Thread Ralf Mueller
Hi,

we recently update our GitLab to 8.6.1 and now the 'View Diff' does not 
work anymore. It produces an error message like:
Error: The patch to 'README' didn't apply cleanly. The temporary files have 
been left in '/tmp/reviewboard.2YSn1I' for debugging purposes. `patch` 
returned: patching file /tmp/reviewboard.2YSn1I/tmp2kVGGw-new (read from 
/tmp/reviewboard.2YSn1I/tmp2kVGGw) Hunk #1 FAILED at 3. 1 out of 1 hunk 
FAILED -- saving rejects to file /tmp/reviewboard.2YSn1I/tmp2kVGGw-new.rej


The result is similar to all review request in the system, which have 
worked before the update.

There are no visible error on the ReviewBoard log neither on GitLab. I have 
check the content of the temporary files from the RB error message and it 
look that the 'old' and the 'new' file contain the same blob. It's also 
visible from the GitLab side that there are to requests and the answer is 
the same.

Any idea what happened here? Is it correct that the blob are identical?

If you need any further information, please let me know.

BR
Ralf

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: ReviewBoard upgrade from 17.2.18 to 2.5.2 fails

2016-02-29 Thread Ralf Mueller
Hello Christian,

any news on this topic?

Kind regards,
Ralf

On Tuesday, February 9, 2016 at 12:39:14 AM UTC+2, Christian Hammond wrote:
>
> Hi Ralf,
>
> Can you verify the versions of Django and django_evolution that are 
> installed?
>
> Christian
>
> -- 
> Christian Hammond - chri...@beanbaginc.com 
> Review Board - https://www.reviewboard.org
> Beanbag, Inc. - https://www.beanbaginc.com
>
> On Mon, Feb 8, 2016 at 7:17 AM, Ralf Mueller <ralf@gmail.com 
> > wrote:
>
>> Hello,
>>
>> I tried to upgrade ReviewBoard on Lnux from version 17.2.18 (running on 
>> Fedora core 20) to version 2.5.2 (running on Centos 7.2).
>> The rb-site 
>>
>> I using mariadb / mysql database.
>>
>> During "rb-site manage xxx upgrade" I got following error message
>> The following are the changes that could not be resolved:
>> The application markup has been deleted
>> In model diffviewer.FileDiff:
>> In field 'legacy_diff_hash':
>> Property 'db_column' has changed
>> In field 'legacy_parent_diff_hash':
>> Property 'db_column' has changed
>> CommandError: Your models contain changes that Django Evolution cannot 
>> resolve automatically.
>>
>> All packages are up-to-data, especially the django-evolution.
>>
>> (Full log attached) I have tried to convert the database tables to
>> InnoDB format but it didn't help.
>> I attached the output of "evolve --hint", the upgrade log and a mysqldump 
>> from the database scheme and the tables "django_evolution 
>> django_project_version".
>>
>>
>>
>> Every hint is welcome.
>>
>> Regards,
>> Ralf
>>
>> -- 
>> Supercharge your Review Board with Power Pack: 
>> https://www.reviewboard.org/powerpack/
>> Want us to host Review Board for you? Check out RBCommons: 
>> https://rbcommons.com/
>> Happy user? Let us know! https://www.reviewboard.org/users/
>> --- 
>> You received this message because you are subscribed to the Google Groups 
>> "reviewboard" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to reviewboard...@googlegroups.com .
>> For more options, visit https://groups.google.com/d/optout.
>>
>
>

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: ReviewBoard upgrade from 17.2.18 to 2.5.2 fails

2016-02-08 Thread Ralf Mueller
Hello Christian,

should be up-to-data here you are:
~]# pip freeze |grep -i django 
Django==1.6.11 
django-evolution==0.7.6 
django-haystack==2.4.1 
django-multiselectfield==0.1.3 
django-pipeline==1.2.24

Regards
Ralf

On Tuesday, February 9, 2016 at 12:39:14 AM UTC+2, Christian Hammond wrote:
>
> Hi Ralf,
>
> Can you verify the versions of Django and django_evolution that are 
> installed?
>
> Christian
>
> -- 
> Christian Hammond - chri...@beanbaginc.com 
> Review Board - https://www.reviewboard.org
> Beanbag, Inc. - https://www.beanbaginc.com
>
> On Mon, Feb 8, 2016 at 7:17 AM, Ralf Mueller <ralf@gmail.com 
> > wrote:
>
>> Hello,
>>
>> I tried to upgrade ReviewBoard on Lnux from version 17.2.18 (running on 
>> Fedora core 20) to version 2.5.2 (running on Centos 7.2).
>> The rb-site 
>>
>> I using mariadb / mysql database.
>>
>> During "rb-site manage xxx upgrade" I got following error message
>> The following are the changes that could not be resolved:
>> The application markup has been deleted
>> In model diffviewer.FileDiff:
>> In field 'legacy_diff_hash':
>> Property 'db_column' has changed
>> In field 'legacy_parent_diff_hash':
>> Property 'db_column' has changed
>> CommandError: Your models contain changes that Django Evolution cannot 
>> resolve automatically.
>>
>> All packages are up-to-data, especially the django-evolution.
>>
>> (Full log attached) I have tried to convert the database tables to
>> InnoDB format but it didn't help.
>> I attached the output of "evolve --hint", the upgrade log and a mysqldump 
>> from the database scheme and the tables "django_evolution 
>> django_project_version".
>>
>>
>>
>> Every hint is welcome.
>>
>> Regards,
>> Ralf
>>
>> -- 
>> Supercharge your Review Board with Power Pack: 
>> https://www.reviewboard.org/powerpack/
>> Want us to host Review Board for you? Check out RBCommons: 
>> https://rbcommons.com/
>> Happy user? Let us know! https://www.reviewboard.org/users/
>> --- 
>> You received this message because you are subscribed to the Google Groups 
>> "reviewboard" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to reviewboard...@googlegroups.com .
>> For more options, visit https://groups.google.com/d/optout.
>>
>
>

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Upgrade from ReviewBoard 1.7.18 to 2.5.2 failed

2016-02-08 Thread Ralf Mueller
Hello,

I have tried to upgrade reviewboard from 1.7.18 (on Fedora 20) to 1.5.2 on 
(Centos 7.2) but the rb-site upgrade fails because of
The following are the changes that could not be resolved: 
The application markup has been deleted 
In model diffviewer.FileDiff: 
   In field 'legacy_diff_hash': 
   Property 'db_column' has changed 
   In field 'legacy_parent_diff_hash': 
   Property 'db_column' has changed

I have tried to convert all tables to InnoDB format but there was no 
difference.
I have also tried to upgrade to 2.0.nn first but there were also problems.

All installed packages especially Django evolution are up-to-date.

I have attached the output of upgrade and evolve --hint as well a a dump of 
the database schema and a dump from the django_evolution 
django_project_version tables.

Any hint is welcome.

Regards,
Ralf

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
-- MySQL dump 10.14  Distrib 5.5.44-MariaDB, for Linux (x86_64)
--
-- Host: localhostDatabase: reviewboard
-- --
-- Server version	5.5.44-MariaDB

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

--
-- Current Database: `reviewboard`
--

CREATE DATABASE /*!32312 IF NOT EXISTS*/ `reviewboard` /*!40100 DEFAULT CHARACTER SET utf8 */;

USE `reviewboard`;

--
-- Table structure for table `accounts_localsiteprofile`
--

DROP TABLE IF EXISTS `accounts_localsiteprofile`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accounts_localsiteprofile` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `user_id` int(11) NOT NULL,
  `profile_id` int(11) NOT NULL,
  `local_site_id` int(11) DEFAULT NULL,
  `direct_incoming_request_count` int(11) DEFAULT NULL,
  `total_incoming_request_count` int(11) DEFAULT NULL,
  `pending_outgoing_request_count` int(11) DEFAULT NULL,
  `total_outgoing_request_count` int(11) DEFAULT NULL,
  `starred_public_request_count` int(11) DEFAULT NULL,
  `permissions` int(1) DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `user_id` (`user_id`,`local_site_id`),
  UNIQUE KEY `profile_id` (`profile_id`,`local_site_id`),
  KEY `accounts_localsiteprofile_fbfc09f1` (`user_id`),
  KEY `accounts_localsiteprofile_141c6eec` (`profile_id`),
  KEY `accounts_localsiteprofile_45ded6af` (`local_site_id`)
) ENGINE=InnoDB AUTO_INCREMENT=647 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `accounts_profile`
--

DROP TABLE IF EXISTS `accounts_profile`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accounts_profile` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `user_id` int(11) NOT NULL,
  `first_time_setup_done` tinyint(1) NOT NULL,
  `collapsed_diffs` tinyint(1) NOT NULL,
  `wordwrapped_diffs` tinyint(1) NOT NULL,
  `syntax_highlighting` tinyint(1) NOT NULL,
  `is_private` tinyint(1) NOT NULL,
  `show_submitted` tinyint(1) NOT NULL,
  `sort_review_request_columns` varchar(256) NOT NULL,
  `sort_dashboard_columns` varchar(256) NOT NULL,
  `sort_submitter_columns` varchar(256) NOT NULL,
  `sort_group_columns` varchar(256) NOT NULL,
  `review_request_columns` varchar(256) NOT NULL,
  `dashboard_columns` varchar(256) NOT NULL,
  `submitter_columns` varchar(256) NOT NULL,
  `group_columns` varchar(256) NOT NULL,
  `timezone` varchar(30) DEFAULT NULL,
  `open_an_issue` tinyint(1) NOT NULL,
  `extra_data` longtext,
  PRIMARY KEY (`id`),
  UNIQUE KEY `user_id` (`user_id`)
) ENGINE=InnoDB AUTO_INCREMENT=686 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `accounts_profile_starred_groups`
--

DROP TABLE IF EXISTS `accounts_profile_starred_groups`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accounts_profile_starred_groups` (
  `id` int(11) 

ReviewBoard upgrade from 17.2.18 to 2.5.2 fails

2016-02-08 Thread Ralf Mueller
Hello,

I tried to upgrade ReviewBoard on Lnux from version 17.2.18 (running on 
Fedora core 20) to version 2.5.2 (running on Centos 7.2).
The rb-site 

I using mariadb / mysql database.

During "rb-site manage xxx upgrade" I got following error message
The following are the changes that could not be resolved:
The application markup has been deleted
In model diffviewer.FileDiff:
In field 'legacy_diff_hash':
Property 'db_column' has changed
In field 'legacy_parent_diff_hash':
Property 'db_column' has changed
CommandError: Your models contain changes that Django Evolution cannot 
resolve automatically.

All packages are up-to-data, especially the django-evolution.

(Full log attached) I have tried to convert the database tables to
InnoDB format but it didn't help.
I attached the output of "evolve --hint", the upgrade log and a mysqldump 
from the database scheme and the tables "django_evolution 
django_project_version".



Every hint is welcome.

Regards,
Ralf

-- 
Supercharge your Review Board with Power Pack: 
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: 
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
--- 
You received this message because you are subscribed to the Google Groups 
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
-- MySQL dump 10.14  Distrib 5.5.44-MariaDB, for Linux (x86_64)
--
-- Host: localhostDatabase: reviewboard
-- --
-- Server version	5.5.44-MariaDB

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

--
-- Current Database: `reviewboard`
--

CREATE DATABASE /*!32312 IF NOT EXISTS*/ `reviewboard` /*!40100 DEFAULT CHARACTER SET utf8 */;

USE `reviewboard`;

--
-- Table structure for table `accounts_localsiteprofile`
--

DROP TABLE IF EXISTS `accounts_localsiteprofile`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accounts_localsiteprofile` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `user_id` int(11) NOT NULL,
  `profile_id` int(11) NOT NULL,
  `local_site_id` int(11) DEFAULT NULL,
  `direct_incoming_request_count` int(11) DEFAULT NULL,
  `total_incoming_request_count` int(11) DEFAULT NULL,
  `pending_outgoing_request_count` int(11) DEFAULT NULL,
  `total_outgoing_request_count` int(11) DEFAULT NULL,
  `starred_public_request_count` int(11) DEFAULT NULL,
  `permissions` int(1) DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `user_id` (`user_id`,`local_site_id`),
  UNIQUE KEY `profile_id` (`profile_id`,`local_site_id`),
  KEY `accounts_localsiteprofile_fbfc09f1` (`user_id`),
  KEY `accounts_localsiteprofile_141c6eec` (`profile_id`),
  KEY `accounts_localsiteprofile_45ded6af` (`local_site_id`)
) ENGINE=InnoDB AUTO_INCREMENT=647 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `accounts_profile`
--

DROP TABLE IF EXISTS `accounts_profile`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accounts_profile` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `user_id` int(11) NOT NULL,
  `first_time_setup_done` tinyint(1) NOT NULL,
  `collapsed_diffs` tinyint(1) NOT NULL,
  `wordwrapped_diffs` tinyint(1) NOT NULL,
  `syntax_highlighting` tinyint(1) NOT NULL,
  `is_private` tinyint(1) NOT NULL,
  `show_submitted` tinyint(1) NOT NULL,
  `sort_review_request_columns` varchar(256) NOT NULL,
  `sort_dashboard_columns` varchar(256) NOT NULL,
  `sort_submitter_columns` varchar(256) NOT NULL,
  `sort_group_columns` varchar(256) NOT NULL,
  `review_request_columns` varchar(256) NOT NULL,
  `dashboard_columns` varchar(256) NOT NULL,
  `submitter_columns` varchar(256) NOT NULL,
  `group_columns` varchar(256) NOT NULL,
  `timezone` varchar(30) DEFAULT NULL,
  `open_an_issue` tinyint(1) NOT NULL,
  `extra_data` longtext,
  PRIMARY KEY (`id`),
  UNIQUE KEY `user_id` (`user_id`)
) ENGINE=InnoDB AUTO_INCREMENT=686 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `accounts_profile_starred_groups`
--

DROP TABLE IF EXISTS `accounts_profile_starred_groups`;
/*!40101 SET @saved_cs_client