(BTW, this is a private repo).
So, if this is a new feature, it means the problem was there all along and I
simply now found out about it! Great!
What I see at that time is the following (I hope the image won’t disappear – if
it does, get it here: https://www.dropbox.com/s/ozzicm164dc2o0d/fork.png?dl=0):
Check-in d137 was originally trunk but moved to a branch ‘mistake’. (I guess
shunning would have been a better solution at the time, but too late now,
right?)
91ef is trunk, and e096 is trunk, but there is no direct link between them,
only through d137. Is this considered a fork even though there is no duplicate
trunk timeline? It’s more like a ‘discontinuous‘ trunk.
What I wanted to do at the time was to make d137 disappear completely. But,
(if I’m not mistaken, based on advice I had received possibly on this list – at
least the way I had understood it), moved it to branch ‘mistake’ to make it
invisible from trunk. So, now I’m stuck with a warning?
Is there a way to re-connect 91ef to e096 without going via d137? Or, even to
re-instate d137 as trunk, if no better way?
Thank you.
-----Original Message-----
From: Richard Hipp
Sent: Friday, May 29, 2015 9:24 PM
To: Fossil SCM user's discussion
Subject: Re: [fossil-users] WARNING: multiple open leaf check-ins on trunk:
On 5/29/15, to...@acm.org <to...@acm.org> wrote:
> I updated to this recent version of fossil:
> This is fossil version 1.33 [282ae5e4de] 2015-05-28 17:05:13 UTC
> Compiled on May 28 2015 21:56:18 using msc-18.00 (32-bit)
> SQLite 3.8.10.2 2015-05-20 18:17:19 2ef4f3a5b1
> Schema version 2015-01-24
> zlib 1.2.8, loaded 1.2.8
> SSL (OpenSSL 1.0.2a 19 Mar 2015)
> UNICODE_COMMAND_LINE
>
> Doing a FOSSIL UP TRUNK command gave me this today:
>
> WARNING: multiple open leaf check-ins on trunk:
> (1) 2015-05-29 17:48:57 [eba9fa6147] (current)
> (2) 2014-11-05 13:36:22 [91ef16c613]
Bring up "fossil ui" then move your browser to
http://localhost:8080/timeline?c=2014-11-05 and you'll see the fork.
This is a new feature of Fossil, not a bug.
--
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 mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
