[fossil-users] I have two trunks?

2014-10-02 Thread dave
Hi list; Today I opened one of my repos, and expected to see some stuff that is in 'trunk'. However, it was empty as the day it was born. I could see all my branches via 'branches', and could update to them, but when I would update to 'trunk' it would always be empty. Odd, I thought, I'm

Re: [fossil-users] I have two trunks?

2014-10-02 Thread B Harder
Hi Dave. This is a fork (unintentional branch). It would happen (for example) if two different clones of a repository are updated independently of each other, and then sync'd. You can merge the errant trunk back to the good trunk without ill effect (minding you might have to do conflict

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Stephan Beal
On Thu, Oct 2, 2014 at 7:29 PM, B Harder brad.har...@gmail.com wrote: This is a fork (unintentional branch). It would happen (for example) if two different clones of a repository are updated independently of each other, and then sync'd. You can merge the errant trunk back to The weird thing

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Andy Bradford
Thus said Stephan Beal on Thu, 02 Oct 2014 19:31:12 +0200: The weird thing is, he's got two initial empty commits. i'm at a loss to explain that. Seems that one of them must have been created with an older fossil and the other created with a newer version from Fossil's trunk

Re: [fossil-users] I have two trunks?

2014-10-02 Thread B Harder
On Oct 2, 2014 11:14 AM, Andy Bradford amb-fos...@bradfords.org wrote: Thus said Stephan Beal on Thu, 02 Oct 2014 19:31:12 +0200: The weird thing is, he's got two initial empty commits. i'm at a loss to explain that. Seems that one of them must have been created with an older fossil

Re: [fossil-users] I have two trunks?

2014-10-02 Thread dave
: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of B Harder Sent: Thursday, October 02, 2014 12:29 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] I have two trunks? Hi Dave. This is a fork (unintentional branch

Re: [fossil-users] I have two trunks?

2014-10-02 Thread dave
-Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of Andy Bradford Sent: Thursday, October 02, 2014 1:15 PM To: Stephan Beal Cc: Fossil SCM user's discussion Subject: Re: [fossil-users] I have two

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Ross Berteig
On 10/2/2014 10:31 AM, Stephan Beal wrote: The weird thing is, he's got two initial empty commits. i'm at a loss to explain that. http://chiselapp.com/user/ziggurat29/repository/z29-3rdParty/timeline I think I can partly explain the two initial empty commits part, or at least show off

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Ross Berteig
Bingo. On 10/2/2014 11:33 AM, dave wrote: I'm tending to suspect not (additional trunk at creation) for a reason that I will soon make clear, but the 'version mismatch' hypothesis is interesting. Fyi, the creation process went like this: * I created my repo locally, with current (v1.29,

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Andy Bradford
Thus said B Harder on Thu, 02 Oct 2014 11:17:23 -0700: Is that even possible? I thought the repo would have to be created once (and only once), generating it's repo-id, and then cloned for all subsequent copies before things can begin deviating. The project-id is stored in a table in a

Re: [fossil-users] I have two trunks?

2014-10-02 Thread dave
... Thus said B Harder on Thu, 02 Oct 2014 11:17:23 -0700: Is that even possible? I thought the repo would have to be created once (and only once), generating it's repo-id, and then cloned for all subsequent copies before things can begin deviating. The project-id is stored in

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Jan Nijtmans
2014-10-02 20:54 GMT+02:00 Andy Bradford: The project-id is stored in a table in a database---it can be changed. I suspect that this is how Chiselapp actually allows you to sync a new repository to their site in some configurations. Because the act of creating a new repository

Re: [fossil-users] I have two trunks?

2014-10-02 Thread tonyp
If it helps: I tried something very simple (in this example: https://chiselapp.com/user/rberteig/repository/WPCLI/home), and it apparently fixed the problem in cloned copy at least. I shunned the empty initial checking, rebuilt, and re-enabled the artifact (just in case). The timeline

Re: [fossil-users] I have two trunks?

2014-10-02 Thread dave
-Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of to...@acm.org Sent: Thursday, October 02, 2014 2:58 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] I have two trunks

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Ron W
On Thu, Oct 2, 2014 at 2:33 PM, dave d...@ziggurat29.com wrote: * Its big, so chisel can't import it, but they have a feature where you explicitly supply the project id, and then you can sync your big repo into it. So I did that. When I did have a repo on Chisel, I didn't notice this

Re: [fossil-users] I have two trunks?

2014-10-02 Thread dave
-Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of Ron W Sent: Thursday, October 02, 2014 3:35 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] I have two trunks? On Thu, Oct 2, 2014 at 2:33

Re: [fossil-users] I have two trunks?

2014-10-02 Thread Ross Berteig
On 10/2/2014 12:57 PM, to...@acm.org wrote: I tried something very simple (in this example: https://chiselapp.com/user/rberteig/repository/WPCLI/home), and it apparently fixed the problem in cloned copy at least. I shunned the empty initial checking, rebuilt, and re-enabled the artifact