Re: [fossil-users] Creating new branch/repository problems

2011-10-23 Thread Matt Welland
On Sun, Oct 23, 2011 at 12:17 PM, Jared Harder wrote:

> @Matt: I followed the directions and eventually started up a second server.
>  I needed to use fossil server instead because I couldn't access the fossil
> ui interface from external machines.  The README file I edited showed up in
> the new branch with the changes applied.
>
> So perhaps it works because of the changes I made as per Richard's
> instructions?  If that's the case, I should be able to create new branches
> in my existing repository?  Also, how can I have other users select the
> appropriate branch to check in to?  Is there a bit of a walkthrough
> explaining how to use branches from within Fossil?
>

If the _FOSSIL_ with repository set to '/home/drh/sqlite/fossil.fossil' was
up-directory from where you executed the steps then yes, without deleting
that file I think you would have seen the same error again. For example in
the example tree drawn below the _FOSSIL_ file in "dir1" will cause you
problems if you attempted to open your repo in dir4. This is generally true
- do not open a fossil inside another fossil controlled area unless you know
exactly what you are doing.

-- dir1
|-- dir2
|   `-- dir4
|   `-- _FOSSIL_
|-- dir3
|   `-- dir4
`-- _FOSSIL

Now all your users need to do it clone and open your new repo and then do:

fossil co 

Where  is the name of the branch to be worked on.

I couldn't find any simple, step by step, branching and merging tutorial for
fossil but the following will get you there with a little reading:

Read Jim Schimpf's excellent book on fossil, the free pdf is here:

http://www.fossil-scm.org/schimpf-book/doc/tip/fossilbook.pdf

More detail about branching/forking is available on the fossil wiki:

http://www.fossil-scm.org/index.html/doc/tip/www/branching.wiki

Matt
-=-


> @Richard: Alright, I've deleted that _FOSSIL_ file.  Should I bother
> getting the newest source and rebuilding, or should I be safe to carry on?
>
> Thanks!
>
> Jared
>
> On Fri, Oct 21, 2011 at 18:48, Richard Hipp  wrote:
>
>>
>>
>> On Fri, Oct 21, 2011 at 7:34 AM, Richard Hipp  wrote:
>>
>>> On Thu, Oct 20, 2011 at 8:01 PM, Jared Harder wrote:
>>>

 No matter what command I try, the error message is always the same:
  ./fossil: repository does not exist or is in an unreadable directory:
 /home/drh/sqlite/fossil.fossil



>>> Very curious. The /home/drh/sqlite/fossil.fossil pathname is the location
>>> of the Fossil repository for Fossil on a machine that I was using as my
>>> desktop up until about 2 months ago.  So I thought perhaps I had used that
>>> name in an example script somewhere.  But grep is not finding it.  And that
>>> pathname is not found anywhere (that I can find) in the canonical Fossil
>>> repository on http://www.fossil-scm.org/.  I'm very eager to learn how
>>> Jared got a checkout that thinks its repository is located at
>>> /home/drh/sqlite/fossil.fossil.
>>>
>>
>> Joe Mistachkin solved this mystery.  The source tarballs from the download
>> page were built incorrectly - they included the _FOSSIL_ file from my
>> development folder.  And that _FOSSIL_ file points to the repository on
>> /home/drh/sqlite/fossil.fossil.  Apparently, Jared built from the source
>> tarball.
>>
>> I've fixed the most recent tarball and deleted all the prior ones.
>> (Source tarballs can still be obtained directly from Fossil using the
>> /tarball web method, of course.)
>>
>> Jared:  You need to find the _FOSSIL_ file in the source directory and
>> delete it.
>>
>>
>>>
>>> Can you give us more information about where your repository came from,
>>> Jared?
>>>
>>> --
>>> D. Richard Hipp
>>> d...@sqlite.org
>>>
>>
>>
>>
>> --
>> 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
>
>
___
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] Creating new branch/repository problems

2011-10-23 Thread Jared Harder
@Matt: I followed the directions and eventually started up a second server.
 I needed to use fossil server instead because I couldn't access the fossil
ui interface from external machines.  The README file I edited showed up in
the new branch with the changes applied.

So perhaps it works because of the changes I made as per Richard's
instructions?  If that's the case, I should be able to create new branches
in my existing repository?  Also, how can I have other users select the
appropriate branch to check in to?  Is there a bit of a walkthrough
explaining how to use branches from within Fossil?

@Richard: Alright, I've deleted that _FOSSIL_ file.  Should I bother getting
the newest source and rebuilding, or should I be safe to carry on?

Thanks!

Jared

On Fri, Oct 21, 2011 at 18:48, Richard Hipp  wrote:

>
>
> On Fri, Oct 21, 2011 at 7:34 AM, Richard Hipp  wrote:
>
>> On Thu, Oct 20, 2011 at 8:01 PM, Jared Harder wrote:
>>
>>>
>>> No matter what command I try, the error message is always the same:
>>>  ./fossil: repository does not exist or is in an unreadable directory:
>>> /home/drh/sqlite/fossil.fossil
>>>
>>>
>>>
>> Very curious. The /home/drh/sqlite/fossil.fossil pathname is the location
>> of the Fossil repository for Fossil on a machine that I was using as my
>> desktop up until about 2 months ago.  So I thought perhaps I had used that
>> name in an example script somewhere.  But grep is not finding it.  And that
>> pathname is not found anywhere (that I can find) in the canonical Fossil
>> repository on http://www.fossil-scm.org/.  I'm very eager to learn how
>> Jared got a checkout that thinks its repository is located at
>> /home/drh/sqlite/fossil.fossil.
>>
>
> Joe Mistachkin solved this mystery.  The source tarballs from the download
> page were built incorrectly - they included the _FOSSIL_ file from my
> development folder.  And that _FOSSIL_ file points to the repository on
> /home/drh/sqlite/fossil.fossil.  Apparently, Jared built from the source
> tarball.
>
> I've fixed the most recent tarball and deleted all the prior ones.  (Source
> tarballs can still be obtained directly from Fossil using the /tarball web
> method, of course.)
>
> Jared:  You need to find the _FOSSIL_ file in the source directory and
> delete it.
>
>
>>
>> Can you give us more information about where your repository came from,
>> Jared?
>>
>> --
>> D. Richard Hipp
>> d...@sqlite.org
>>
>
>
>
> --
> 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