Re: [fossil-users] Merging deleted files (Was: Merge - including files from other branches - best practice?)

bucks. -- Scott Robison ___ 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] Merge - including files from other branches - best practice?

/fossil-users -- Scott Robison ___ 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] Two trunks?

. leaves by default only shows open leaves, but has --all and --closed options to pick other sets of leaves that might be useful, as well as --recompute. -- Scott Robison ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil

Re: [fossil-users] Symlink trouble

On Wed, Apr 8, 2015 at 12:17 PM, Ron W ronw.m...@gmail.com wrote: On Wed, Apr 8, 2015 at 1:58 PM, Scott Robison sc...@casaderobison.com wrote: Or whatever your team dictates. :) In our case, we are required to follow industry guidelines, except where compelling technical issues require

Re: [fossil-users] Symlink trouble

), use what you have to use for the platform. Otherwise use whatever you feel most comfortable with. Or whatever your team dictates. :) -- Scott Robison ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi

Re: [fossil-users] Remove redundant shun links from doc page.

://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Scott Robison ___ 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] fossil all rebuild: “not a valid repository”

question, or am telling you stuff you already know, my apologies. -- Scott Robison ___ 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] Any interest in testing/merging check-in-edit branch?

On phone, apologies for top posting. To me amend uuid should behave as much as possible like commit, though I can appreciate that some might disagree. On Jul 17, 2015 8:38 PM, Andy Bradford amb-fos...@bradfords.org wrote: Thus said Sergei Gavrikov on Thu, 16 Jul 2015 17:21:55 +0300: I also

Re: [fossil-users] The "exec-rel-paths" branch...

> -- > Joe Mistachkin > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Scott Robison ___ fossil-users mailing list fossil-users@lists.fo

Re: [fossil-users] SHA1 and security

On Thu, Oct 29, 2015 at 8:41 AM, Eduard <eduard.c.dumitre...@gmail.com> wrote: > Hi Scott, > > Thank you for your reply! > > On 10/29/2015 01:40 AM, Scott Robison wrote: > > On Wed, Oct 28, 2015 at 6:37 PM, Eduard <eduard.c.dumitre...@gmail.com > > <mailt

Re: [fossil-users] SHA1 and security

all files > in the R card. It's an MD5 hash, but that still means the attacker > would have to find replacement source code that (a) matched both SHA1 > and MD5 hashes and (b) was valid C code. Good luck with that. > Wait, so fossil is already doing what I suggested it could

Re: [fossil-users] SHA1 and security

On Thu, Oct 29, 2015 at 1:07 PM, Warren Young <w...@etr-usa.com> wrote: > On Oct 28, 2015, at 11:40 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > the odds of a non-malicious collision are so close to zero that those > odds might as well be zero. > &g

Re: [fossil-users] SHA1 and security

ing man in the middle attack" or "capable of social engineering to convince people to use evil artifact" or "something else I can't think of at the moment") seems to be a pretty tiny intersection. -- Scott Robison ___ 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] SHA1 and security

I can see the point. In this case, it's just an identifier, and the odds of a non-malicious collision are so close to zero that those odds might as well be zero. -- Scott Robison ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.

Re: [fossil-users] Unexpected merge conflict

On Nov 13, 2015 9:15 AM, "Tony Papadimitriou" wrote: > > Sorry for the confusion. > By “merge from trunk” I mean I’m in branch ‘trunk’ and from there I’m doing the merge. > And, I’m merging the “check-in from the ... [other] branch” I mean the check-in which is part of the other

Re: [fossil-users] Unexpected merge conflict

On Nov 13, 2015 8:20 AM, "Tony Papadimitriou" wrote: > > Here’s a merge conflict I thought should have been resolved automatically: > > I have the trunk version from where the symbol RF_OUT is renamed to SRF_OUT in the branch version. It has never been renamed to SRF_OUT in the

Re: [fossil-users] Unexpected merge conflict

tent carries previous > check-ins” or “Cannot cherry pick this particular line” would also be nice. > > *From:* Scott Robison <sc...@casaderobison.com> > *Sent:* Friday, November 13, 2015 6:40 PM > *To:* Fossil SCM user's discussion <fossil-users@lists.fossil-scm

Re: [fossil-users] Unexpected merge conflict

> Many thanks also to all previous respondents. > > *From:* Scott Robison <sc...@casaderobison.com> > *Sent:* Saturday, November 14, 2015 8:22 PM > *To:* Fossil SCM user's discussion <fossil-users@lists.fossil-scm.org> > *Subject:* Re: [fossil-users] Unexpected mer

Re: [fossil-users] Fossil internal error: out of memory

gt; > Andy > -- > TAI64 timestamp: 40005649f289 > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Scott Robison __

Re: [fossil-users] Fossil repo on a network share?

Cheers & thanks, > DG > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Scott Robison ___ fossil-users ma

Re: [fossil-users] xkcd on git

t my choice. It was the choice of someone else and it had a negative impact on me. I was able to fix it be deleting my local repo and recloning, so it wasn't the end of the world, but I have a hard time imagining a scenario where fossil would have allowed somethin

Re: [fossil-users] xkcd on git

On Nov 1, 2015 6:09 PM, "Ron W" wrote: > > On Sun, Nov 1, 2015 at 4:14 AM, Stephan Beal wrote: >> >> But if it only stores a pointer, and requires the user to reconstruct the link, it's not terribly useful/friendly. The user would potentially have to

Re: [fossil-users] SHA1 and security

On Oct 29, 2015 6:50 PM, "Warren Young" wrote: > > I also wonder what will happen if someone with an existing checkout checks in a diff against the changeling file, and the diffs overlap with the evil bits. I assume the server will try to apply the patch and fail, or the next

Re: [fossil-users] xkcd on git

po maintenance / usage would not make that possible. Or maybe it would. I'd love to hear some example of how that might happen in fossil. It's one thing to be actively using a repository and using the full set of repo management commands (open, update, commit, branch, etc) and getting into some

Re: [fossil-users] xkcd on git

my employer has been migrating to git from svn for a while now, though we're not 100% migrated yet), I find it maddening. I have used fossil on some projects and wind up committing the "final product" to git when necessary (since git fans seem to find intermediate history objectionable or of li

Re: [fossil-users] xkcd on git

On Mon, Nov 2, 2015 at 5:01 PM, Ron W <ronw.m...@gmail.com> wrote: > On Mon, Nov 2, 2015 at 6:38 PM, Scott Robison <sc...@casaderobison.com> > wrote: >> >> From https://en.wikipedia.org/wiki/NTFS_symbolic_link#Restrictions: The >> default security settings

Re: [fossil-users] xkcd on git

ing symbolic links. *This behavior can be changed running "secpol.msc" the Local Security Policy management console (under: Security Settings\Local Policies\User Rights Assignment\Create symbolic links). It can be worked around by starting **cmd.exe <https://en.wikipedia.org/wiki/Cmd.

Re: [fossil-users] xkcd on git

On Mon, Nov 2, 2015 at 5:21 PM, Jan Danielsson <jan.m.daniels...@gmail.com> wrote: > On 03/11/15 00:38, Scott Robison wrote: > >>> On 11/2/15, Jan Danielsson <jan.m.daniels...@gmail.com> wrote: > >>>> > >>>> Supporting symlinks on Windows

Re: [fossil-users] source code file is considered by fossil to be binary.

ors. Certainly isn't "Unicode compliant" since Unicode doesn't assign glyphs to those code points, but it does display them. -- Scott Robison ___ 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] source code file is considered by fossil to be binary.

me up with some sort of quoting escape mechanism to show such characters, but it would be non-standard by definition. -- Scott Robison ___ 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] source code file is considered by fossil to be binary.

aracter codes less than ASCII SPACE? CR, LF, TAB all have well defined meanings. How should the rest be rendered? -- Scott Robison ___ 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] SHA-1 in user.pw field

y encryption to the data so that the operating system only decrypts data on demand. This isn't perfect, and unfortunately, the point to a DVCS is to share the data with anyone who has access (assuming the access is permitted and not fraudulently obtained). Encrypting the data isn't really an option

Re: [fossil-users] Attack against the Fossil website?

___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Scott Robison ___ 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] Attack against the Fossil website?

> Is this anything to be concerned about? Should I block this anomalous > traffic, or should I just leave them alone? > I found this link that might explain what you're seeing: http://resources.distilnetworks.com/h/i/53822092-is-pushdo-screwing-you-details-of-the-botnet/181642 -- Scott Robison __

Re: [fossil-users] Fossil repo on a network share?

On Nov 18, 2015 1:28 AM, "Stephan Beal" wrote: > > On Wed, Nov 18, 2015 at 9:19 AM, Dömötör Gulyás wrote: >> >> And unfortunately not all devs sit in the same building. Anyway, I'll just upload a repo, probably most people will just read it, and when

Re: [fossil-users] Unexpected merge conflict

nk was confusing. It was not in the trunk, but was in the baseline, which was not strictly speaking a common ancestor, but the terminology used was inaccurate / confusing for a cherrypick merge. I hope that explanation makes sense. Perhaps it would make sense to modify the "

[fossil-users] Bad press for GitHub

Not really a flaw with git, but this jumped out at me tonight: http://www.theregister.co.uk/2015/09/01/github_bug_costs_man_thousands/ ___ fossil-users mailing list fossil-users@lists.fossil-scm.org

Re: [fossil-users] Bad press for GitHub

at self hosting is arguably safer (at least from this sort of attack) than using something like GitHub (or Chisel which doesn't even rate a mention on the Wikipedia page referenced). And I (still) feel bad for the guy. I hope GitHub or Microsoft help reimburse him, at least in part. SDR > >

Re: [fossil-users] Bad press for GitHub

d repositories are arguably safer. Especially projects no one has ever heard of! ;) Perhaps the first time in history someone was sad that git didn't lose data. #zing > > > On Wed, Sep 2, 2015 at 10:39 AM, Stephan Beal <sgb...@googlemail.com> wrote: >> >> On Wed, Sep 2, 2

Re: [fossil-users] Why Hash

eliberate collisions, but even in so doing there is far more to do than just "push an update". Given the widespread use of SHA-1 in DVCS systems, and the use of GPG signatures to authenticate commits, I think it would be reasonable to enhance the cryptographic security in a future vers

Re: [fossil-users] Why Hash

On Tue, Sep 15, 2015 at 7:46 PM, Warren Young <w...@etr-usa.com> wrote: > On Sep 15, 2015, at 7:01 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > > > I think calling it a non sequitur is not completely fair > > Stephan stated that Fossil isn’t

Re: [fossil-users] Why Hash

On Sep 16, 2015 3:24 AM, "Michal Suchanek" <hramr...@gmail.com> wrote: > > On 16 September 2015 at 05:16, Scott Robison <sc...@casaderobison.com> wrote: > > But GPG could solve any weaknesses with Fossil's use of SHA-1, though. It > > won't prevent a det

Re: [fossil-users] diff after update

ecame a > feature of ``fossil undo?'' > > fossil undo --diff > Ooh, I like this... +1 I also like fossil diff --undo, but if that is too confusing, perhaps fossil diff --undo-buffer Or other word for buffer. -- Scott Robison ___ fossil-users maili

Re: [fossil-users] diff after update

ossil stash gdiff ?STASHID? Why not do it the same way for undo? It seems to be most in line with precedent. Perhaps because undo doesn't currently have subcommands, just options. Still, it would be the most intuitive thing based on existing practice. -- Scott Robison __

[fossil-users] Interesting video on Google repository

https://www.youtube.com/watch?v=W71BTkUbdqE -- Scott Robison ___ 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] Why Hash

owers that be want to make a change of algorithm for ID generation, that'd be fine. I just don't see any urgency myself in non-cryptographic applications. -- Scott Robison ___ 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] Why Hash

On Mon, Sep 14, 2015 at 1:01 PM, Warren Young <w...@etr-usa.com> wrote: > On Sep 14, 2015, at 12:11 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > > > > Fossil would be free to switch to a different algorithm later if that > seemed like a good id

Re: [fossil-users] MERGE problem (with renames/deletes)

newly introduced (or re-introduced) file should be merged because > it is wanted change.* > > Thanks. > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman

Re: [fossil-users] MERGE problem (with renames/deletes)

rted after renaming file in a branch, > >> merging trunk changes to it works only once, and subsequent merges > >> do nothing: > >> > >> > http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg20758.html > ‎ > > > I'm not sure what to do

Re: [fossil-users] MERGE problem

list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Scott Robison ___ 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] MERGE problem (with renames/deletes)

ossil-users%40lists.fossil-scm.org/msg20417.html > > > > 2. ‎(In June) Andy G reported after renaming file in a branch, merging > trunk changes to it works only once, and subsequent merges do nothing: > > > http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg20758.html &

Re: [fossil-users] Fossil mentioned on HN

ate a branch. 2. Commit to the branch regularly. 3. Get ready to merge by rebasing your branch. 4a. Merge your branch to trunk and only push trunk. 4b. Push your branch and merge it. 5. Delete branch. This workflow makes me long for the days where all I had to worry about was a usually simple rebase operat

Re: [fossil-users] Rewrite of fossil-v-git.wiki. Was: Fossil mentioned on HN

Is a sql database fault tolerant? I guess so, but think that is not what most people consider fault tolerant. On Dec 16, 2015 9:36 AM, "Stephan Beal" wrote: > Section 4.1: in fossil, but not git: fault-tolerant storage. > > - stephan beal, sgb...@googlemail.com >

Re: [fossil-users] Fossil mentioned on HN

f my private branch 100% pristine and proper, and only then merge it to trunk. I could just as easily have created a new branch off the tip of trunk,and merged my private branch to the public branch, which I could then merge to trunk so that people aren't upset at me for working on trunk. -- Scott R

Re: [fossil-users] Fossil mentioned on HN

On Wed, Dec 16, 2015 at 4:12 PM, wrote: > > Hmm.. If one can create a private branch, do all draft work there and when done merge to trunk (or other non-private branch), then sync with the main repo, the main repo will not contain any traces of the private branch (with the draft

Re: [fossil-users] Fossil mentioned on HN

On Wed, Dec 16, 2015 at 4:53 PM, Warren Young <w...@etr-usa.com> wrote: > On Dec 16, 2015, at 2:28 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > > > couldn't 99% of rebase use cases be handled with private branches? > > Probably not wit

Re: [fossil-users] Fossil mentioned on HN

On Wed, Dec 16, 2015 at 6:41 PM, Ron W <ronw.m...@gmail.com> wrote: > On Wed, Dec 16, 2015 at 6:53 PM, Scott Robison <sc...@casaderobison.com> > wrote: > >> > You can remove all private branches from a repository using this >> command: >> > fo

Re: [fossil-users] Fossil mentioned on HN

trunk. I'm not trying to suggest it is in any way nearly as "elegant" as "rebase -i" (those who prefer that would find this clunky at best). Still, it seems possible. -- Scott Robison ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] git quote

! Anything but git! -- Scott Robison ___ 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] how to report bug in fossil

On Jun 10, 2016 6:04 AM, "Jan Nijtmans" <jan.nijtm...@gmail.com> wrote: > > 2016-06-10 10:12 GMT+02:00 Scott Robison: > > FYI, my test code here (C++ harness) consisted of passing every possible > > four byte buffer to the old function and my new function. My fu

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 12:26 PM, Scott Robison <sc...@casaderobison.com> wrote: > On Jun 10, 2016 6:04 AM, "Jan Nijtmans" <jan.nijtm...@gmail.com> wrote: > > > > 2016-06-10 10:12 GMT+02:00 Scott Robison: > > > FYI, my test code here (C++ harness) co

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 5:24 PM, Joe Mistachkin <sql...@mistachkin.com> wrote: > > Scott Robison wrote: > > > > So my expectation that it would automatically update the utf.test file is > > incorrect? I'm supposed to manually integrate that file back to

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 7:10 PM, Joe Mistachkin <sql...@mistachkin.com> wrote: > > Scott Robison wrote: > > > > Okay, thanks for all the help. I've committed some new test cases that > > demonstrate errors in the trunk invalid_utf8. 16 tests fail on trunk, >

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 4:23 PM, Joe Mistachkin <sql...@mistachkin.com> wrote: > > Scott Robison wrote: > > > > Also: Simply uncommenting the "createTestResults $tempPath 100" call > doesn't > > seem to be doing anything for me. Here is what I'm doing:

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 3:27 PM, Scott Robison <sc...@casaderobison.com> wrote: > On Fri, Jun 10, 2016 at 12:26 PM, Scott Robison <sc...@casaderobison.com> > wrote: > >> On Jun 10, 2016 6:04 AM, "Jan Nijtmans" <jan.nijtm...@gmail.com> wrote: >>

Re: [fossil-users] how to report bug in fossil

nes of comments to clarify what the code is doing in the tricky part). -- Scott Robison ___ 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] how to report bug in fossil

On Thu, Jun 9, 2016 at 6:19 PM, Warren Young <w...@etr-usa.com> wrote: > On Jun 9, 2016, at 6:01 PM, Scott Robison <sc...@casaderobison.com> wrote: > > > > On Thu, Jun 9, 2016 at 2:12 PM, Warren Young <w...@etr-usa.com> wrote: > > On Jun 9, 2016, at

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 1:15 AM, Jan Nijtmans <jan.nijtm...@gmail.com> wrote: > 2016-06-10 2:01 GMT+02:00 Scott Robison: > > I just committed > > a one line fix (with multiple lines of comments to clarify what the code > is > > doing in the tricky part). > >

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 1:37 AM, Joe Mistachkin <sql...@mistachkin.com> wrote: > > Scott Robison > > > > Glad to be able to get to something before everyone else for a change. :) > > > > Yes, thank you very much. > > Also, I know it's not a lot of fu

Re: [fossil-users] how to report bug in fossil

On Fri, Jun 10, 2016 at 2:04 AM, Scott Robison <sc...@casaderobison.com> wrote: > On Fri, Jun 10, 2016 at 1:37 AM, Joe Mistachkin <sql...@mistachkin.com> > wrote: > >> >> Scott Robison >> > >> > Glad to be able to get to something before everyone

Re: [fossil-users] winsymlink branch

On Jun 3, 2016 10:11 AM, "jungle Boogie" <jungleboog...@gmail.com> wrote: > > On 31 May 2016 at 01:58, Scott Robison <sc...@casaderobison.com> wrote: > > Just an announcement in case anyone is using the winsymlink branch (which > > seems unlikely to me

[fossil-users] winsymlink branch

Just an announcement in case anyone is using the winsymlink branch (which seems unlikely to me). I've merged the current trunk into winsymlink. The only functionality exposed in the winsymlink branch, other than what's in trunk, is Windows symbolic links. Carry on. -- Scott Robison

Re: [fossil-users] --nosync option for merge, update, checkout when disconnected

On Mon, May 30, 2016 at 2:47 PM, John P. Rouillard wrote: > In message

Re: [fossil-users] Web comment editor transforms LF into CRLF

xt for CRs, and if it > doesn’t find any, it should strip them out of the changed comment text > before storing it in the DB. > Would it be a bad thing to just settle on LF only going forward, always stripping CR? -- Scott Robison ___ foss

Re: [fossil-users] Web comment editor transforms LF into CRLF

On Fri, Jun 17, 2016 at 6:04 PM, Warren Young <w...@etr-usa.com> wrote: > On Jun 17, 2016, at 1:59 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > > > Would it be a bad thing to just settle on LF only going forward, always > stripping CR? > > Th

Re: [fossil-users] is fossil repo web configuration possible from command-line?

epo fossil setup that allows me to create a repo using any of the others as a "template" and specify the project name & description. It uses SQL to tweak the settings rather than anything specific to fossil. I'm happy to share what I have (ugl

Re: [fossil-users] Compiling and running Fossil on old hardware

gt; Andy > -- > TAI64 timestamp: 400056c003e8 > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Scott Robison ___

Re: [fossil-users] opening more than one ui on localhost

On Sun, Feb 14, 2016 at 4:22 AM, j. van den hoff wrote: > > On Sun, 14 Feb 2016 02:12:01 +0100, Boruch Baum wrote: > >> After Warren Young commented on the "flatness" of forum-style >> discussions instead of the "threaded" viewing option in

Re: [fossil-users] opening more than one ui on localhost

On Sun, Feb 14, 2016 at 5:33 PM, Andy Bradford <amb-fos...@bradfords.org> wrote: > Thus said Scott Robison on Sun, 14 Feb 2016 05:10:49 -0700: > > > There is a lot of intelligence that goes into mailing lists that might > > not be captured in the repository without extra e

Re: [fossil-users] Compiling and running Fossil on old hardware

On Sun, Feb 14, 2016 at 9:57 PM, Warren Young <w...@etr-usa.com> wrote: > On Feb 13, 2016, at 10:41 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > > > I wonder if I could build fossil for my old Commodore 64. > > No way. Contemporary compilers would

[fossil-users] Scripting fossil

sitory setup. It makes assumptions likely unique to my configuration (hard coded paths, a single user name being used for all commits, no branches, maybe more). Still, it might be a useful reference. -- Scott Robison ___ 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] Scripting fossil

On Fri, Feb 19, 2016 at 4:55 PM, Warren Young <w...@etr-usa.com> wrote: > On Feb 18, 2016, at 7:20 PM, Scott Robison <sc...@casaderobison.com> > wrote: > > > > As it turns out, this wasn't a great plan. > > I agree. I even dislike checking configure scripts

Re: [fossil-users] fossil update --latest not working

> you see the remote changes in the timeline in your local repository and >> Fossil simply does not update your open checkout to those versions of >> the file? Or do you not see the changes at all? >> >> Can you provide some output from the commands you

Re: [fossil-users] fossil update --latest not working

On Thu, Apr 7, 2016 at 4:45 AM, Scott Robison <sc...@casaderobison.com> wrote: > What is the branch tag reported by fossil status? Perhaps the branch you > were on got renamed? > > On Thu, Apr 7, 2016 at 2:43 AM, John Regehr <reg...@cs.utah.edu> wrote: > >

Re: [fossil-users] Colored output on console

On Apr 24, 2016 4:07 AM, "Marko Käning" wrote: > > Hi devs, > > it would be great if one could colorise Fossil’s output on the console! > > Quite a few times I missed an error or warning message which slipped in between of many lines of the usual fossil output on the

Re: [fossil-users] Colored output on console

On Apr 25, 2016 8:48 AM, "Michael Richter" wrote: > > I know that every time I mention this I get silently, perhaps even hostilely, ignored, but really guys, why not just use fsl for your customization needs? I don't use fsl myself, though I have no quarrel with its

Re: [fossil-users] Noob usage questions

confused about where you are, but I don't think the question "which workspace am I in" vs "what is the current branch" is any more difficult. And it saves the whole "I have to stash my current state so I can switch branches and do some work then switch back and unstash and so on". -- Scott Robison ___ 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 control as backup. Was: Noob usage questions

have to search Facebook, Twitter, or YouTube for my data in a disaster recovery situation. I haven't had to recovery any data yet, but I'm certain it will be a cinch. ;) -- Scott Robison ___ 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] update vs checkout

On Apr 30, 2016 6:00 PM, "Steve Schow" wrote: > > I forgot one step in this process I want: > > > On Apr 30, 2016, at 5:56 PM, Steve Schow wrote: > > > > > > > fossil checkout trunk > > (work on code) > > fossil commit —branch mybranch > > (work on more code)

Re: [fossil-users] update vs checkout

Make that "fossil status or changes or extras or some combination thereof". On Apr 30, 2016 6:32 PM, "Scott Robison" <sc...@casaderobison.com> wrote: > > On Apr 30, 2016 6:00 PM, "Steve Schow" <st...@bstage.com> wrote: > > > > I forgot

Re: [fossil-users] update vs checkout

y rarely occur ;-) > > fossil update > (code review my branch) >switch context back to trunk for their checkout, not sure exact command > to use yet) > fossil merge mybranch > > (final feature test) > > fossil commit >

Re: [fossil-users] update vs checkout

le thing to specify some other ancestor VERSION or version from > another branch?…I hope you’re saying that this is in order to merge another > branch into this one…within the repo. Yes? > > its not clear to me how I can create a merged branch somewhere that has > all of the tentative c

Re: [fossil-users] update vs checkout

d*]; >*2*->*merge*[style=*dotted*,color=*red*]; >*merge*->*3*[color=*red*]; >*2*->*3*[weight=*8*]; > >*trunk*->*developerB*[style=*dotted*,color=*blue*]; >*developerB*->*2*[style=*dotted*,color=*blue*]; > } > > > > > &

Re: [fossil-users] update vs checkout

Note that you have to merge mybranch back to trunk, otherwise all the changes made in mybranch will live happily over there forever. Once you updated to trunk, you abandoned all committed work from the other branch. On Sat, Apr 30, 2016 at 11:27 PM, Scott Robison <sc...@casaderobison.com>

[fossil-users] Sing a song of praise for git {retch}

choices of rants to read online. I and the entire Scott Robison team would like to thank you for choosing us over the competition. -- Scott Robison ___ 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] Sing a song of praise for git {retch}

On Wed, May 18, 2016 at 1:31 PM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Wed, 18 May 2016 13:12:30 -0600 > Scott Robison <sc...@casaderobison.com> wrote: > > [...] > > Yes, I dislike git (though TortoiseGit makes it a lot more > >

Re: [fossil-users] Sing a song of praise for git {retch}

e day turned into a day in the office because I needed to coordinate with people more closely than I could remotely. -- Scott Robison ___ 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] Workaround for the missing 'squash' command?

(perhaps restricted) squash command which would > only > work on private branches? > :-) > ___ > 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] Compiler warnings

On Aug 2, 2016 9:12 AM, "Richard Hipp" wrote: > > On 8/2/16, Ron W wrote: > > > > Are there really still compilers in use > > that don't implement C99? > > > > I still build Fossil on a circa-2002 iBook. (See section 4 of >

Re: [fossil-users] false positive UTF-8 test

What version of fossil are you using? Some changes have been made fairly recently that you may not have. On Jul 19, 2016 1:16 AM, "Svyatoslav Mishyn" wrote: > Hello, > > I'm using Fossil to store GPG encrypted passwords; > > and one file Fossil detects as UTF-8: > >

<    1   2   3   >