Re: [fossil-users] Time to release Fossil version 1.34?

[Jan Nijtmans]

2015-10-20 19:51 GMT+02:00 Joe Mistachkin :
> Jan Nijtmans wrote:
>>
>> It turns out that the cause of this problem is the following commit:
>> 
>> so I backed it out. My local trunk build doesn't show the problem
>> any more.
>>
>
> Actually, it appears you backed out two check-ins.  The original one and
> the follow-up that fixed the timeline issue it had.

Yes, that was on purpose. Since the second commit fixed a problem in
the first one, only backing out the first would would result in left-over
dead code.

> I've moved the backout off trunk so the issues that remain, if any, can
> be fixed prior to the release.

It's up to you (or Richard) to review it. Please don't take too long, it's
only a few lines of code. And people are already complaining about
this issue.

Regards,
 Jan Nijtmans
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Time to release Fossil version 1.34?

[Joe Mistachkin]

Jan Nijtmans wrote:
> 
> It turns out that the cause of this problem is the following commit:
> 
> so I backed it out. My local trunk build doesn't show the problem
> any more.
> 

Actually, it appears you backed out two check-ins.  The original one and
the follow-up that fixed the timeline issue it had.

I've moved the backout off trunk so the issues that remain, if any, can
be fixed prior to the release.

--
Joe Mistachkin

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Time to release Fossil version 1.34?

[Martin Gagnon]

> Le 20 oct. 2015 à 03:45, Jan Nijtmans  a écrit :
> 
> 2015-10-20 9:16 GMT+02:00 Marcel Graf :
>> On Sun, Oct 18, 2015 at 10:38 PM, Joe Mistachkin 
>> wrote:
>>> There seems to be a timeline issue:
>>> 
>>>https://system.data.sqlite.org/index.html/timeline?n=50&y=all&v=1
>>> 
>>> The [2c6bdf20ea] merge check-in has two entries for each of the modified
>>> files.
>> 
>> 
>> The are also duplicate entries in the Changes-section of the Check-In page
>> https://system.data.sqlite.org/index.html/info/2c6bdf20ea066691, even after
>> the fix http://fossil-scm.org/index.html/info/22e0427b1048534e to fossil.
> 
> It turns out that the cause of this problem is the following commit:
>
> so I backed it out. My local trunk build doesn't show the problem
> any more.
> 

Yes, this checkin was an attempt to fix another case where a single checkin 
modify files and does a merge in same time. In that case it would not show the 
files from the merge at all. Obviously, the fix was too simplistic.

Here is the discussion in fossil-dev ML where I tried to point out the problem.

https://www.mail-archive.com/fossil-dev@mailinglists.sqlite.org/msg00269.html

-- 
Martin G.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Time to release Fossil version 1.34?

[Jan Nijtmans]

2015-10-20 9:16 GMT+02:00 Marcel Graf :
> On Sun, Oct 18, 2015 at 10:38 PM, Joe Mistachkin 
> wrote:
>> There seems to be a timeline issue:
>>
>> https://system.data.sqlite.org/index.html/timeline?n=50&y=all&v=1
>>
>> The [2c6bdf20ea] merge check-in has two entries for each of the modified
>> files.
>
>
> The are also duplicate entries in the Changes-section of the Check-In page
> https://system.data.sqlite.org/index.html/info/2c6bdf20ea066691, even after
> the fix http://fossil-scm.org/index.html/info/22e0427b1048534e to fossil.

It turns out that the cause of this problem is the following commit:

so I backed it out. My local trunk build doesn't show the problem
any more.

Regards,
 Jan Nijtmans
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Time to release Fossil version 1.34?

[Marcel Graf]

On Sun, Oct 18, 2015 at 10:38 PM, Joe Mistachkin 
wrote:

>
> There seems to be a timeline issue:
>
> https://system.data.sqlite.org/index.html/timeline?n=50&y=all&v=1
>
> The [2c6bdf20ea] merge check-in has two entries for each of the modified
> files.
>

The are also duplicate entries in the Changes-section of the Check-In page
https://system.data.sqlite.org/index.html/info/2c6bdf20ea066691, even after
the fix http://fossil-scm.org/index.html/info/22e0427b1048534e to fossil.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Time to release Fossil version 1.34?

[Joe Mistachkin]

There seems to be a timeline issue:

https://system.data.sqlite.org/index.html/timeline?n=50&y=all&v=1

The [2c6bdf20ea] merge check-in has two entries for each of the modified
files.

--
Joe Mistachkin

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users