Re: [fossil-users] multiple open leaf on closed branches?

2016-06-07 Thread Ron W 
On Tue, Jun 7, 2016 at 2:27 AM, Luca Ferrari  wrote:
>
> In the meantime I've tried the desperate trick:
>
> % fossil merge --integrate  --force aa9521ccd9
>
> but the leaf is still listed on the open ones.
>

As Richard said, it's not a real problem.

I would suggest you compare the files in the extra open leaf with it's
sibling commit(s) to be sure you don't miss any changes.
___
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] multiple open leaf on closed branches?

2016-06-07 Thread Richard Hipp 
On 6/7/16, Luca Ferrari  wrote:
> On Mon, Jun 6, 2016 at 10:59 AM, Richard Hipp  wrote:
>> No.  Can you make the repo available for analysis?
>>
>
> Sorry, my employer does not grant me to do it. Is there anything I can
> export that can be useful? The repo is actually 800+MB.
>
> In the meantime I've tried the desperate trick:
>
> % fossil merge --integrate  --force aa9521ccd9
>
> but the leaf is still listed on the open ones.


There is nothing inherently wrong with having open leaves.  You could
simply ignore the issue.

-- 
D. Richard Hipp
d...@sqlite.org
___
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] multiple open leaf on closed branches?

2016-06-07 Thread Luca Ferrari 
On Mon, Jun 6, 2016 at 10:59 AM, Richard Hipp  wrote:
> No.  Can you make the repo available for analysis?
>

Sorry, my employer does not grant me to do it. Is there anything I can
export that can be useful? The repo is actually 800+MB.

In the meantime I've tried the desperate trick:

% fossil merge --integrate  --force aa9521ccd9

but the leaf is still listed on the open ones.

Luca
___
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] multiple open leaf on closed branches?

2016-06-06 Thread Richard Hipp 
On 6/6/16, Luca Ferrari  wrote:
> On Tue, May 31, 2016 at 4:28 PM, Luca Ferrari 
> wrote:
>> The commit is marked as merged and the branch is shown in the closed
>> list, am I missing something?
>> What could happen if I try to reclose the open leaves?
>
> Anyone has an idea of what is fossil telling me?

No.  Can you make the repo available for analysis?


-- 
D. Richard Hipp
d...@sqlite.org
___
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] multiple open leaf on closed branches?

2016-06-06 Thread Luca Ferrari 
On Tue, May 31, 2016 at 4:28 PM, Luca Ferrari  wrote:
> The commit is marked as merged and the branch is shown in the closed
> list, am I missing something?
> What could happen if I try to reclose the open leaves?

Anyone has an idea of what is fossil telling me?
Just for clarity: this is a repo I've imported 2+ years ago from git,
however the open leafs have a date that is well after the import so I
don't believe it is related to the "problem".
Could I close the leafs?

Thanks,
Luca
___
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] multiple open leaf on closed branches?

2016-05-31 Thread Luca Ferrari 
On Tue, May 31, 2016 at 2:26 PM, Joerg Sonnenberger  wrote:
> On Tue, May 31, 2016 at 01:50:01PM +0200, Luca Ferrari wrote:
>> So the branch 'feature-installazioni' is closed, and is merged.
>> I'm a little confused.
>
> A merge doesn't automatically close a branch, it must be instructed so.

The commit is marked as merged and the branch is shown in the closed
list, am I missing something?
What could happen if I try to reclose the open leaves?

Luca
___
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] multiple open leaf on closed branches?

2016-05-31 Thread Joerg Sonnenberger 
On Tue, May 31, 2016 at 01:50:01PM +0200, Luca Ferrari wrote:
> So the branch 'feature-installazioni' is closed, and is merged.
> I'm a little confused.

A merge doesn't automatically close a branch, it must be instructed so.

Joerg
___
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] multiple open leaf on closed branches?

2016-05-31 Thread Luca Ferrari 
On Tue, May 31, 2016 at 8:16 AM, Luca Ferrari  wrote:
> WARNING: multiple open leaf check-ins on trunk:
>   (1) 2016-05-30 15:25:09 [fc75337a99] (current)
>   (2) 2015-11-19 14:08:50 [aa9521ccd9]
>   (3) 2015-08-26 08:18:19 [c413c4592a]

I've tried to inspect one of the open leaf:

% fossil leaves -c | grep c413c4592a

and nothing is reported, so apparently this leaf is not closed.
However:

% fossil info  c413c4592a -v
uuid: c413c4592a084187b92b37a0ec000af5b9e09a8f 2015-08-26 08:18:19 UTC
parent:   d0fcfd18f5d1873bbe2175c81119ae8cb0353287 2015-08-25 09:03:40 UTC
merged-into:  f1fba691939b4323ad24771598713861c61c496e 2015-08-26 08:19:45 UTC
tags: TEST_03092015, trunk


% fossil info f1fba691939b4323ad24771598713861c61c496e
uuid: f1fba691939b4323ad24771598713861c61c496e 2015-08-26 08:19:45 UTC
parent:   4ff26c4d0c38dd5ea68cb31d5009249b72843824 2015-08-26 08:16:34 UTC
merged-from:  c413c4592a084187b92b37a0ec000af5b9e09a8f 2015-08-26 08:18:19 UTC
child:504ff067d3af42e5e179a48c61c21e41121b95db 2015-08-26 08:24:37 UTC
tags: feature-installazioni
% fossil branch list -c
...
  feature-installazioni

So the branch 'feature-installazioni' is closed, and is merged.
I'm a little confused.

Luca
___
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] multiple open leaf on closed branches?

2016-05-31 Thread Luca Ferrari 
On Mon, May 30, 2016 at 6:12 PM, Joerg Sonnenberger  wrote:
>> Maybe the LEAF table in the database file is somehow out of sync.
>> Have you tried running "fossil rebuild" to see if that clears the
>> problem?
>
> Or the more light-weight "fossil leaves --recompute" for starters.

Nope!
I've done:

% fossil leaves --recompute
% fossil stat
...
WARNING: multiple open leaf check-ins on trunk:
  (1) 2016-05-30 15:25:09 [fc75337a99] (current)
  (2) 2015-11-19 14:08:50 [aa9521ccd9]
  (3) 2015-08-26 08:18:19 [c413c4592a]

% fossil rebuild
% fossil stat
...
WARNING: multiple open leaf check-ins on trunk:
  (1) 2016-05-30 15:25:09 [fc75337a99] (current)
  (2) 2015-11-19 14:08:50 [aa9521ccd9]
  (3) 2015-08-26 08:18:19 [c413c4592a]


I'm running 1.34 [62dcb00e68].
Am I missing something?
___
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] multiple open leaf on closed branches?

2016-05-30 Thread Joerg Sonnenberger 
On Mon, May 30, 2016 at 11:49:47AM -0400, Richard Hipp wrote:
> On 5/30/16, Luca Ferrari  wrote:
> > Hi all,
> > I suspect I did not get right the multiple open leaf warning:
> >
> 
> Maybe the LEAF table in the database file is somehow out of sync.
> Have you tried running "fossil rebuild" to see if that clears the
> problem?

Or the more light-weight "fossil leaves --recompute" for starters.

Joerg
___
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] multiple open leaf on closed branches?

2016-05-30 Thread Richard Hipp 
On 5/30/16, Luca Ferrari  wrote:
> Hi all,
> I suspect I did not get right the multiple open leaf warning:
>

Maybe the LEAF table in the database file is somehow out of sync.
Have you tried running "fossil rebuild" to see if that clears the
problem?

-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] multiple open leaf on closed branches?

2016-05-30 Thread Luca Ferrari 
Hi all,
I suspect I did not get right the multiple open leaf warning:

% fossil stat
...
checkout: fc75337a991c9a1156735b1eca3f9cdd0d2ca70f 2016-05-30 15:25:09 UTC
parent:   e7c2399f591e36e1ec947dfb7b034b2c02697b4b 2016-05-30 12:37:08 UTC
tags: trunk
...
WARNING: multiple open leaf check-ins on trunk:
  (1) 2016-05-30 15:25:09 [fc75337a99] (current)
  (2) 2015-11-19 14:08:50 [aa9521ccd9]
  (3) 2015-08-26 08:18:19 [c413c4592a]

Now, if I go to the 2015-08-26 timeline I see a merge of a branch that
has been integrated (it shows up as closed):

% fossil info c413c4592a
uuid: c413c4592a084187b92b37a0ec000af5b9e09a8f 2015-08-26 08:18:19 UTC
parent:   d0fcfd18f5d1873bbe2175c81119ae8cb0353287 2015-08-25 09:03:40 UTC
merged-into:  f1fba691939b4323ad24771598713861c61c496e 2015-08-26 08:19:45 UTC
tags: trunk, TEST_03092015

The same for the other open leaf.
What is fossil telling me then?

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