Hi again,
I've just discovered something and maybe it is helpful. I checked the
"artifact" webpage for both of these rogue artifacts, and I get multiple
sources for the artifact in question, e.g.:
http://localhost:8080/artifact/f66f7a17b7
Artifact f66f7a17b78ba617acde90fc810107f34f1a1f2e:
File 3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/manifest -
part of check-in [079a920cf4] at 2016-03-13 00:00:00 on branch trunk - **
message elided **
File 3rdparty/chromium/third_party/sqlite/src/manifest - part of
check-in [079a920cf4] at 2016-03-13 00:00:00 on branch trunk - ** message
elided **
Also Manifest of check-in [f66f7a17b7] - Version 3.8.7.4 by drh on
2014-12-09 01:34:36.
C Version\s3.8.7.4
D 2014-12-09T01:34:36.054
F Makefile.arm-wince-mingw32ce-gcc
d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
F VERSION d7e46e14bd7393d54d19ad900222e5f20d41ea1b
...
And the other artifact is the similar. Could this account for the odd
behaviour? Fossil has somehow got confused about an actual commit and a
manifest file that has been checked in?
So, I certainly don't want to shun this artifact because then I'll lose a
file from a valid check-in -- isn't that right? But how can I fix it?
Thanks again for your help in my hour of need :o)
Andy
----- Original Message -----
From: "Andy Gibbs" <andyg1...@hotmail.co.uk>
To: <fossil-users@lists.fossil-scm.org>
Sent: Friday, May 27, 2016 6:26 PM
Subject: Weird cross-contamination between two fossil repositories (and not
even talking to server!)
Hi,
I've just had a very, very odd experience with fossil. I'm running
version 1.34.
Let me first explain what I have done.
I cloned a respository off our server. I then went into the clone's web
UI and disabled the auto-sync feature. I then made 7 commits, the first
of which caused a trunk fork which I then "repaired" by branching the old
tip-of-trunk that caused the fork. I then committed two commits to the
new branch, then realised that I'd committed the wrong code, so shunned
the last two commits, rebuilt the respository, unshunned the sha1
signatures, rebuilt, then recommitted the last two commits using the
correct code.
Ok, a little complicated but nothing too out-of-the-ordinary, I hope.
Except ... now I have two utterly random commits in my cloned repository -
both seemingly from the sqlite repository:
2014-12-09 [f66f7a17b7] Version 3.8.7.4 (user: drh, tags: release,
version-3.8.7.4)
2011-05-19 [ed1da510a2] Version 3.7.6.3 release candidate 1. (user: drh)
Now, it is true that I have a clone of the sqlite respository on my server
too ... but I haven't yet synced with the server. Absolutely no server
communication has happened since my initial clone. And these odd
artifacts were definitely not there (or, rephrased, definitely not
showing) when I was mid-way through all of this work, and are not there on
the server's copy of the repository either.
Unfortunately, I cannot say exactly when these artifacts appeared, but my
hunch would be somepoint around the shunning/rebuilding process? Does
this even make sense?!?
Worse, I am left not sure whether to simply shun the two random artifacts
and then push the changes to the repository up to the server. It has
taken the best part of a day to get all these commits in and it represents
about 6GB of source files (the repository has doubled from ~700 MB to ~1.5
GB) requiring a lot of manual "fossil mv"s to synchronise many moved files
(fossil doesn't yet support a git-like auto-mv-detection sadly).
Any idea how I can easily check the validity of my repository? I have
done the obvious which is to check out each of the recent check-ins and
compare them with the original source folders, but what I don't know is
whether the structure of my respository is damaged in some way...
Help!!!! :o)
Thanks!
Andy
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
