[fossil-users] Version 1.18 Bug: 'update -n' does not work for merged files
If I want to see what files might change with an 'update', I supply the '-n' option. E.g. fossil update -n For files that have a merge conflict, the 'baseline', 'original', and 'merge' files get created on my local file system. All other files that would get updated do not get updated (the expected result with the -n option). I would expect that no changes to my file system would occur when using the '-n' option. If this is not a bug, the documentation for the 'update' command should be changed to reflect the actual behavior. Thanks, Marty Backe ___ 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] Version 1.18
On Thu, Jul 14, 2011 at 7:06 AM, Steve Bennett ste...@workware.net.auwrote: I can't seem to test it because my manifest.uuid file has gone missing :-( You must have upgraded originally cloned your repo from a really old version of Fossil. Fix this by typing: fossil set manifest on -- 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] Version 1.18
I have tagged the release of Fossil version 1.18. You can pickup a copy at http://www.fossil-scm.org/download.html Comments on the download page enumerate the changes in this release. This is no compelling reason to upgrade - it just had been a long time since there had been a release and so I felt I ought to do one. Yes, I know the OpenBSD binary is not available just yet. I'm working on that -- 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] Version 1.18
On 07/13/11 19:27, Richard Hipp wrote:
I have tagged the release of Fossil version 1.18. You can pickup a copy at
http://www.fossil-scm.org/download.html
Comments on the download page enumerate the changes in this release.
This is no compelling reason to upgrade - it just had been a long time
since there had been a release and so I felt I ought to do one.
Yes, I know the OpenBSD binary is not available just yet. I'm working
on that
the configure script (yeah I know it's not necessary) bombs:
$ sh ./configure
jimsh: not found
Host System...i386-unknown-netbsdelf5.1.
Build System...i386-unknown-netbsdelf5.1.
C compiler... cc -g -O2
C++ compiler... c++ -g -O2
Checking for stdlib.h...ok
Checking for uint32_t...Checking for pread...ok
Checking for tclsh...ok
Checking for zlib.h...ok
Checking libs for inflateEnd...-lz
auto.def:77 missing close-bracket
in expression [check-for-openssl $msg...
missing close-bracket
in expression [check-for-openssl $msg...
(parsing expression [check-for-openssl $ms...)
invoked from within
if {[check-for-openssl $msg $cflags $ldflags} {
incr found
break
}
(foreach body line 11)
invoked from within
foreach dir $ssldirs {
if {$dir eq } {
set msg system ssl
set cflags
set ldflags ...
invoked from within
if {$ssldirs ne none} {
set found 0
if {$ssldirs in {auto }} {
catch {
set cflags [exec pkg-config openssl --cflags-on...
(file auto.def line 77)
invoked from within
source $autosetup(autodef)
(procedure main line 148)
invoked from within
main $argv
Add the closing bracket on line 101 of auto.def to fix.
For those who are too lazy to build themselves, grab the stripped NetBSD (5.1)
x86 binary ( fossil: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV),
dynamically linked (uses shared libs), for NetBSD 5.1, stripped ) from
http://uharc.net/~phaeton/fossil-netbsd-x86-20110713.zip
SHA1:
e377f0f4b7dec7ece2650686c064e95b14e6 fossil-netbsd-x86-20110713.zip
Thanks @ Richard contributors!
Regards,
-Martin
___
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] Version 1.18
On 14/07/2011, at 10:01 AM, Martin S. Weber wrote:
On 07/13/11 19:27, Richard Hipp wrote:
I have tagged the release of Fossil version 1.18. You can pickup a copy at
http://www.fossil-scm.org/download.html
Comments on the download page enumerate the changes in this release.
This is no compelling reason to upgrade - it just had been a long time
since there had been a release and so I felt I ought to do one.
Yes, I know the OpenBSD binary is not available just yet. I'm working
on that
the configure script (yeah I know it's not necessary) bombs:
$ sh ./configure
jimsh: not found
Host System...i386-unknown-netbsdelf5.1.
Build System...i386-unknown-netbsdelf5.1.
C compiler... cc -g -O2
C++ compiler... c++ -g -O2
Checking for stdlib.h...ok
Checking for uint32_t...Checking for pread...ok
Checking for tclsh...ok
Checking for zlib.h...ok
Checking libs for inflateEnd...-lz
auto.def:77 missing close-bracket
in expression [check-for-openssl $msg...
missing close-bracket
in expression [check-for-openssl $msg...
(parsing expression [check-for-openssl $ms...)
invoked from within
if {[check-for-openssl $msg $cflags $ldflags} {
incr found
break
}
(foreach body line 11)
invoked from within
foreach dir $ssldirs {
if {$dir eq } {
set msg system ssl
set cflags
set ldflags ...
invoked from within
if {$ssldirs ne none} {
set found 0
if {$ssldirs in {auto }} {
catch {
set cflags [exec pkg-config openssl --cflags-on...
(file auto.def line 77)
invoked from within
source $autosetup(autodef)
(procedure main line 148)
invoked from within
main $argv
Add the closing bracket on line 101 of auto.def to fix.
For those who are too lazy to build themselves, grab the stripped NetBSD
(5.1)
x86 binary ( fossil: ELF 32-bit LSB executable, Intel 80386, version 1
(SYSV),
dynamically linked (uses shared libs), for NetBSD 5.1, stripped ) from
http://uharc.net/~phaeton/fossil-netbsd-x86-20110713.zip
SHA1:
e377f0f4b7dec7ece2650686c064e95b14e6 fossil-netbsd-x86-20110713.zip
Thanks @ Richard contributors!
Regards,
-Martin
Thanks Martin.
Please try the attached fix.
Cheers,
Steve
--
µWeb: Embedded Web Framework - http://uweb.workware.net.au/
WorkWare Systems Pty Ltd
W: www.workware.net.au P: +61 434 921 300
E: ste...@workware.net.au F: +61 7 3391 6002
auto-def-missing-bracket.patch
Description: Binary data
___
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] Version 1.18
On 14/07/2011, at 12:05 PM, Steve Bennett wrote:
On 14/07/2011, at 10:01 AM, Martin S. Weber wrote:
On 07/13/11 19:27, Richard Hipp wrote:
I have tagged the release of Fossil version 1.18. You can pickup a copy at
http://www.fossil-scm.org/download.html
Comments on the download page enumerate the changes in this release.
This is no compelling reason to upgrade - it just had been a long time
since there had been a release and so I felt I ought to do one.
Yes, I know the OpenBSD binary is not available just yet. I'm working
on that
the configure script (yeah I know it's not necessary) bombs:
$ sh ./configure
jimsh: not found
Host System...i386-unknown-netbsdelf5.1.
Build System...i386-unknown-netbsdelf5.1.
C compiler... cc -g -O2
C++ compiler... c++ -g -O2
Checking for stdlib.h...ok
Checking for uint32_t...Checking for pread...ok
Checking for tclsh...ok
Checking for zlib.h...ok
Checking libs for inflateEnd...-lz
auto.def:77 missing close-bracket
in expression [check-for-openssl $msg...
missing close-bracket
in expression [check-for-openssl $msg...
(parsing expression [check-for-openssl $ms...)
invoked from within
if {[check-for-openssl $msg $cflags $ldflags} {
incr found
break
}
(foreach body line 11)
invoked from within
foreach dir $ssldirs {
if {$dir eq } {
set msg system ssl
set cflags
set ldflags ...
invoked from within
if {$ssldirs ne none} {
set found 0
if {$ssldirs in {auto }} {
catch {
set cflags [exec pkg-config openssl --cflags-on...
(file auto.def line 77)
invoked from within
source $autosetup(autodef)
(procedure main line 148)
invoked from within
main $argv
Add the closing bracket on line 101 of auto.def to fix.
For those who are too lazy to build themselves, grab the stripped NetBSD
(5.1)
x86 binary ( fossil: ELF 32-bit LSB executable, Intel 80386, version 1
(SYSV),
dynamically linked (uses shared libs), for NetBSD 5.1, stripped ) from
http://uharc.net/~phaeton/fossil-netbsd-x86-20110713.zip
SHA1:
e377f0f4b7dec7ece2650686c064e95b14e6 fossil-netbsd-x86-20110713.zip
Thanks @ Richard contributors!
Regards,
-Martin
Thanks Martin.
Please try the attached fix.
Oh. I see you already worked out the fix for yourself :-)
--
µWeb: Embedded Web Framework - http://uweb.workware.net.au/
WorkWare Systems Pty Ltd
W: www.workware.net.au P: +61 434 921 300
E: ste...@workware.net.au F: +61 7 3391 6002
___
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] Version 1.18
On 14/07/2011, at 9:27 AM, Richard Hipp wrote: I have tagged the release of Fossil version 1.18. You can pickup a copy at http://www.fossil-scm.org/download.html Comments on the download page enumerate the changes in this release. This is no compelling reason to upgrade - it just had been a long time since there had been a release and so I felt I ought to do one. Yes, I know the OpenBSD binary is not available just yet. I'm working on that I notice that you kept the --disable-internal-sqlite option in auto.def, but removed the corresponding change in src/main.mk to actually implement it. Is that because it used a gnu-make feature? If so, it could be done more portably. Cheers, Steve -- µWeb: Embedded Web Framework - http://uweb.workware.net.au/ WorkWare Systems Pty Ltd W: www.workware.net.au P: +61 434 921 300 E: ste...@workware.net.au F: +61 7 3391 6002 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
