[fossil-users] problem importing from git

2011-06-29 Thread John Nowak
I am trying to import a very small git repository but I'm running into an 
error; I've no git branch named "trunk" if that makes a difference:

$ git fast-export --full-tree --all | fossil import --git foo.fossil
Rebuilding repository meta-data...
  100.0% complete...
Vacuuming... ok
project-id: 24a1d0ce43a789efe70c1473afb4ff5d303a1620
server-id:  44fbbb7b52d94279f7fed2b2d7ff92b7a4c73ba1
admin-user: jn (password is "57357d")

$ fossil open foo.fossil 
fossil: not a valid object name: trunk

I've tried reconstructing; not sure if this is correct:

$ fossil reconstruct foo.fossil .
fossil: SQLITE_ERROR: table blob already exists
fossil: table blob already exists

Rebuilding makes no difference. Any ideas?

- jn
___
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] problem importing from git

2011-06-29 Thread John Nowak
On Jun 29, 2011, at 3:53 AM, John Nowak wrote:

> $ fossil reconstruct foo.fossil .
> fossil: SQLITE_ERROR: table blob already exists
> fossil: table blob already exists

Just realized I did this wrong. I'm new to fossil obviously.

Still, deconstructing and then reconstructing results in the same error. No 
error occurs on deconstruction. Still stuck.

- jn

___
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] problem importing from git

2011-06-29 Thread Lluís Batlle i Rossell
On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote:
> On Jun 29, 2011, at 3:53 AM, John Nowak wrote:
> 
> > $ fossil reconstruct foo.fossil .
> > fossil: SQLITE_ERROR: table blob already exists
> > fossil: table blob already exists
> 
> Just realized I did this wrong. I'm new to fossil obviously.
> 
> Still, deconstructing and then reconstructing results in the same error. No 
> error occurs on deconstruction. Still stuck.

'foo.fossil' should not exist before 'reconstruct'. Does it exist?
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] branch colour

2011-06-29 Thread Christopher Vance
I've seen the --bgcolor option for 'fossil branch new', but was
wondering if I can change the colour on an existing branch?

-- 
Christopher Vance
___
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] branch colour

2011-06-29 Thread Steve Landers

On 29/06/2011, at 4:49 PM, Christopher Vance wrote:

> I've seen the --bgcolor option for 'fossil branch new', but was
> wondering if I can change the colour on an existing branch?

Yep, via the web interface.  Look for the Edit link.

Oh, and g'day Chris, good to have you on board and fossilising :)

Steve

___
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] branch colour

2011-06-29 Thread Christopher Vance
Found it, thanks. Nice to hear from you again, Steve.

On Wed, Jun 29, 2011 at 6:56 PM, Steve Landers
 wrote:
>
> On 29/06/2011, at 4:49 PM, Christopher Vance wrote:
>
>> I've seen the --bgcolor option for 'fossil branch new', but was
>> wondering if I can change the colour on an existing branch?
>
> Yep, via the web interface.  Look for the Edit link.
>
> Oh, and g'day Chris, good to have you on board and fossilising :)
>
> Steve
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>



-- 
Christopher Vance
___
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] problem importing from git

2011-06-29 Thread John Nowak

On Jun 29, 2011, at 4:11 AM, Lluís Batlle i Rossell wrote:

> On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote:
>> On Jun 29, 2011, at 3:53 AM, John Nowak wrote:
>> 
>>> $ fossil reconstruct foo.fossil .
>>> fossil: SQLITE_ERROR: table blob already exists
>>> fossil: table blob already exists
>> 
>> Just realized I did this wrong. I'm new to fossil obviously.
>> 
>> Still, deconstructing and then reconstructing results in the same error. No 
>> error occurs on deconstruction. Still stuck.
> 
> 'foo.fossil' should not exist before 'reconstruct'. Does it exist?

No, I was deconstructing and then reconstructing a new "foo2.fossil" after I 
understood how the command works. I can't open that one either though; same 
"not a valid object name" error.

- jn
___
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] problem importing from git

2011-06-29 Thread Lluís Batlle i Rossell
On Wed, Jun 29, 2011 at 07:08:52AM -0400, John Nowak wrote:
> 
> On Jun 29, 2011, at 4:11 AM, Lluís Batlle i Rossell wrote:
> 
> > On Wed, Jun 29, 2011 at 04:01:35AM -0400, John Nowak wrote:
> >> On Jun 29, 2011, at 3:53 AM, John Nowak wrote:
> >> 
> >>> $ fossil reconstruct foo.fossil .
> >>> fossil: SQLITE_ERROR: table blob already exists
> >>> fossil: table blob already exists
> >> 
> >> Just realized I did this wrong. I'm new to fossil obviously.
> >> 
> >> Still, deconstructing and then reconstructing results in the same error. 
> >> No error occurs on deconstruction. Still stuck.
> > 
> > 'foo.fossil' should not exist before 'reconstruct'. Does it exist?
> 
> No, I was deconstructing and then reconstructing a new "foo2.fossil" after I 
> understood how the command works. I can't open that one either though; same 
> "not a valid object name" error.

What fossil version?

(Not that I know how to fix it, but this may be useful for the code owner who
can fix it)
___
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] problem importing from git

2011-06-29 Thread Richard Hipp
On Wed, Jun 29, 2011 at 3:53 AM, John Nowak  wrote:

> I am trying to import a very small git repository but I'm running into an
> error; I've no git branch named "trunk" if that makes a difference:
>
> $ git fast-export --full-tree --all | fossil import --git foo.fossil
> Rebuilding repository meta-data...
>  100.0% complete...
> Vacuuming... ok
> project-id: 24a1d0ce43a789efe70c1473afb4ff5d303a1620
> server-id:  44fbbb7b52d94279f7fed2b2d7ff92b7a4c73ba1
> admin-user: jn (password is "57357d")
>
> $ fossil open foo.fossil
> fossil: not a valid object name: trunk
>

Try this:

fossil open foo.fossil master




>
> I've tried reconstructing; not sure if this is correct:
>
> $ fossil reconstruct foo.fossil .
> fossil: SQLITE_ERROR: table blob already exists
> fossil: table blob already exists
>
> Rebuilding makes no difference. Any ideas?
>
> - jn
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>



-- 
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] problem importing from git

2011-06-29 Thread John Nowak
On Jun 29, 2011, at 8:37 AM, Lluís Batlle i Rossell wrote:

> What fossil version?

"This is fossil version [0448438c56] 2011-05-28 18:51:22 UTC"
___
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] problem importing from git

2011-06-29 Thread John Nowak

On Jun 29, 2011, at 8:47 AM, Richard Hipp wrote:

> Try this:
> 
>fossil open foo.fossil master

No dice, even though I do have a branch named "master" as expected:

$ fossil open foo.fossil master
fossil: not a valid object name: master

However, I was able to specify the only other branch and it worked fine. 
Strange. I think that leaves me stuck with only that branch though; neither 
"master" nor "trunk" shows up in 'fossil ui' (although all of my commits do).

I've tried importing other git repositories and they seem to work fine. I'm 
working with 1.7.4 if that makes a difference.

I've noticed that it seems "master" is remapped to "trunk" for the repositories 
that do work... or at least I think so. Is that perhaps not happening properly 
with this particular repository thus causing the error?

- jn
___
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] Can't make gdiff work

2011-06-29 Thread Brian Cottingham
I installed openssl-devel and was able to successfully compile fossil in
Cygwin with a simple "make" command, no Makefile modifications necessary.

Would it be easy to add a check for openssl-devel to the build process to
provide a more helpful error message than the compile error?


On Tue, Jun 28, 2011 at 3:48 PM, Tomek Kott  wrote:

> I think as long as you have the development versions of libssl installed on
> your cygwin, you should be set. I'll try to remember to try it at home
> myself, and report back.
>
> Tomek
>
>
> 2011/6/28 Lluís Batlle i Rossell 
>
>> On Tue, Jun 28, 2011 at 08:38:28AM -0700, Matt Welland wrote:
>> > Are you using fossil compiled for cygwin or fossil compiled for windows?
>> If
>> > the later then internally it will not know about cygwin paths and may
>> not be
>> > able to launch cygwin binaries (not sure on that one, haven't tested
>> it).
>>
>> I specially build fossil on cygwin (there is no distributed cygwin binary
>> on
>> fossil-scm.org), in order to have terminal capabilities. I like the rxvt
>> terminal vim to be launched on commit, and it only works with a
>> cygwin-aware
>> fossil. That is, fossil built on cygwin.
>>
>> It's trivial to build there.
>>
>> > On Tue, Jun 28, 2011 at 8:34 AM, Brian Cottingham > >wrote:
>> >
>> > > I'm using Fossil from a Cygwin terminal and I can't get the gdiff
>> command
>> > > to work with vimdiff. I've tried setting gdiff-command to "vimdiff"
>> but
>> > > running "fossil gdiff" I get "'vimdiff' is not recognized as an
>> internal or
>> > > external command". I tried setting the command to "/usr/bin/vimdiff"
>> but I
>> > > get "The system cannot find the path specified". vimdiff is definitely
>> in my
>> > > $PATH. What am I doing wrong?
>> > >
>> > > ___
>> > > 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
>>
>
>
> ___
> 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] Can't make gdiff work

2011-06-29 Thread Stephan Beal
On Wed, Jun 29, 2011 at 4:45 PM, Brian Cottingham wrote:

> Would it be easy to add a check for openssl-devel to the build process to
> provide a more helpful error message than the compile error?


And what would the error be? It is not an error for SSL to be missing. It is
an error to try to use it when it is missing.

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
___
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] Can't make gdiff work

2011-06-29 Thread Brian Cottingham
I think something like ./configure scripts usually print would do the job.
Something like "could not find SSL development libraries" would indicate
what's wrong much more clearly than "./bld/http_ssl_.c:232: error: expected
‘)’ before ‘*’ token" does.


On Wed, Jun 29, 2011 at 11:28 AM, Stephan Beal wrote:

> On Wed, Jun 29, 2011 at 4:45 PM, Brian Cottingham wrote:
>
>> Would it be easy to add a check for openssl-devel to the build process to
>> provide a more helpful error message than the compile error?
>
>
> And what would the error be? It is not an error for SSL to be missing. It
> is an error to try to use it when it is missing.
>
> --
> - stephan beal
> http://wanderinghorse.net/home/stephan/
>
> ___
> 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