[fossil-users] keeping the private blobs up to date

2017-08-08 Thread Karn Kallio 

Hello,

fossil 2.3 has given an error when pushing a private branch:

Error: Database error: UNIQUE constraint failed: private.rid: {INSERT
INTO private VALUES(4)}

Inspecting the source, it seems that in the function content_put_ex in
the file content.c that only a new rid should be marked as private,
since a rid that adds data to a phantom will already have had the
private marking done when the phantom was added.

The attached patch only marks the rid as private when also adding a
phantom.

However while this corrects the private branch push error I do not know
whether it causes other errors, violates invariants, etc.
diff -Naur fossil-2.3-upstream/src/content.c fossil-2.3/src/content.c
--- fossil-2.3-upstream/src/content.c	2017-07-20 23:19:30.0 -0400
+++ fossil-2.3/src/content.c	2017-08-08 22:46:11.690063606 -0400
@@ -598,10 +598,10 @@
 if( !pBlob ){
   db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
 }
-  }
-  if( g.markPrivate || isPrivate ){
-db_multi_exec("INSERT INTO private VALUES(%d)", rid);
-markAsUnclustered = 0;
+if( g.markPrivate || isPrivate ){
+  db_multi_exec("INSERT INTO private VALUES(%d)", rid);
+  markAsUnclustered = 0;
+}
   }
   if( nBlob==0 ) blob_reset();
 
___
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] Using fossil across OSes

2017-08-08 Thread Artur Shepilko 
> I have used fossil on WinXP for quite sometime now and have many separate
> fossils project wise.  Now, I have switched my os to Linux Mint.  Fossil is
> able to open the existing fossils created under windows, but I am unable to
> make any changes to them.

Not clear what is your set up and steps that led to the error. Just a
wild guess.
Try to do 'fossil close' on the repo while still at your original PC
(WinXP?). I assume there're no uncommitted changes in that work-dir,
otherwise commit as needed and close the repo.
Then re-open the repo on your linux-PC. Alternatively, 'fossil close
--force' may be of help, again, mind the uncommitted changes!

If you intend on using the repo in such "shared" setup between OSes,
it would make more sense to 'fossil clone'  (instead of 'fossil open')
on each of your target OSes from that "shared" media. This way each OS
would get its working copy of the repo, without any potential cross-OS
locking/referencing issues. In such case you'd 'fossil sync' or
auto-sync to your "shared" media and 'fossil update' on the other OS
to keep local copies up-to-date.

Hope this helps.
___
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] Bug: Unable to clone

2017-08-08 Thread Roy Keene 

Victor,

	No message appears to have been included in this email... was that 
intentional ?


Thanks,
Roy Keene

On Tue, 8 Aug 2017, Victor Wagner wrote:


On Tue, 13 Jun 2017 06:34:20 -0500 (CDT)
Roy Keene  wrote:


Richard,

That seems to have fixed it:


$ cd ~/devel/aurae
$ /home/rkeene/devel/fossil/fossil version
This is fossil version 2.3 [3200a7c72e] 2017-06-13 05:12:55
UTC $ /home/rkeene/devel/fossil/fossil rebuild
  100.0% complete...
rebuilding the search index... done
$ rm -f /tmp/x.repo; /home/rkeene/devel/fossil/fossil clone
~/devel/aurae/.repo /tmp/x.repo Repository cloned into /tmp/x.repo
Rebuilding repository meta-data...
  100.0% complete...
Extra delta compression...
Vacuuming the database...
project-id: 6f28ae81cd49eaeaa8d55ac7bd1bad5ef71c4ad4
server-id:  09c7831f6f8b06a5dc2497431444a4f3961ffec2
admin-user: rkeene (password is "010b01")
$ /home/rkeene/devel/fossil/fossil fts
check-in search: on
document search: on
ticket search:   on
wiki search: on
Porter stemmer:  on
full-text index: enabled
documents:   3515
$

Thanks,
Roy Keene


On Tue, 13 Jun 2017, Richard Hipp wrote:


On 6/13/17, Roy Keene  wrote:

Richard,

No change.



I checked in a change (to trunk) that seems likely to fix this.
Please try yet again using the latest trunk.
--
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


___
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] Bug: Unable to clone

2017-08-08 Thread Victor Wagner 
On Tue, 13 Jun 2017 06:34:20 -0500 (CDT)
Roy Keene  wrote:

> Richard,
> 
>   That seems to have fixed it:
> 
> 
>   $ cd ~/devel/aurae
>   $ /home/rkeene/devel/fossil/fossil version
>   This is fossil version 2.3 [3200a7c72e] 2017-06-13 05:12:55
> UTC $ /home/rkeene/devel/fossil/fossil rebuild
> 100.0% complete...
>   rebuilding the search index... done
>   $ rm -f /tmp/x.repo; /home/rkeene/devel/fossil/fossil clone
> ~/devel/aurae/.repo /tmp/x.repo Repository cloned into /tmp/x.repo
>   Rebuilding repository meta-data...
> 100.0% complete...
>   Extra delta compression...
>   Vacuuming the database...
>   project-id: 6f28ae81cd49eaeaa8d55ac7bd1bad5ef71c4ad4
>   server-id:  09c7831f6f8b06a5dc2497431444a4f3961ffec2
>   admin-user: rkeene (password is "010b01")
>   $ /home/rkeene/devel/fossil/fossil fts
>   check-in search: on
>   document search: on
>   ticket search:   on
>   wiki search: on
>   Porter stemmer:  on
>   full-text index: enabled
>   documents:   3515
>   $
> 
> Thanks,
>   Roy Keene
> 
> 
> On Tue, 13 Jun 2017, Richard Hipp wrote:
> 
> > On 6/13/17, Roy Keene  wrote:
> >> Richard,
> >>
> >>No change.
> >>
> >
> > I checked in a change (to trunk) that seems likely to fix this.
> > Please try yet again using the latest trunk.
> > -- 
> > 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