Re: [fossil-users] About the help command

2015-05-08 Thread paul
Hi Andy, On 08/05/15 23:34, Andy Bradford wrote: Thus said paul on Fri, 08 May 2015 21:17:36 +0100: OK, so if I do a merge with baseline, supply two UUID's so that I only merge the changes for one UUID, are you saying that cherrypick is a shortcut for that, because you only need to supp

Re: [fossil-users] About the help command

2015-05-08 Thread Andy Bradford
Thus said paul on Fri, 08 May 2015 21:17:36 +0100: > OK, so if I do a merge with baseline, supply two UUID's so that I only > merge the changes for one UUID, are you saying that cherrypick is a > shortcut for that, because you only need to supply one UUID with > cherrypick? I see, you'

Re: [fossil-users] About the help command

2015-05-08 Thread paul
On 08/05/15 21:03, Andy Bradford wrote: Thus said paul on Fri, 08 May 2015 20:51:44 +0100: For example, what's the difference between merge with baseline and cherrypick? The documentation probably should explain that somewhere. When you merge, you merge in all changes leading up to tha

Re: [fossil-users] About the help command

2015-05-08 Thread j. van den hoff
On Fri, 08 May 2015 21:14:07 +0200, Abilio Marques wrote: Ohhh, I did use dbstat the other day (several times actually) while working with some binary files. But yeah, I know there is the -a list, plus the hidden list. But I'm still happy to know that almost everything I use is at hand,

Re: [fossil-users] About the help command

2015-05-08 Thread paul
On 08/05/15 21:03, Andy Bradford wrote: Thus said paul on Fri, 08 May 2015 20:51:44 +0100: For example, what's the difference between merge with baseline and cherrypick? The documentation probably should explain that somewhere. When you merge, you merge in all changes leading up to tha

Re: [fossil-users] About the help command

2015-05-08 Thread Andy Bradford
Thus said paul on Fri, 08 May 2015 20:51:44 +0100: > For example, what's the difference between merge with baseline and > cherrypick? The documentation probably should explain that somewhere. When you merge, you merge in all changes leading up to that baseline (e.g. if you merge in a

Re: [fossil-users] About the help command

2015-05-08 Thread paul
On 08/05/15 20:14, Abilio Marques wrote: I believe there is room for improvements in the online documentation too. I want this email chain to be around that idea. If my memory serves me correctly, fossil help scrub isn't quite right ... It says that by default only passwords are removed, bu

Re: [fossil-users] About the help command

2015-05-08 Thread paul
On 08/05/15 19:29, Warren Young wrote: I believe sometimes you do understand a thing so much, that you end up forgetting the explanation. I think the situation with “merge” is that it’s supposed to just work when run in the obvious way. You just have to get over your anxiety over the correct

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread Abilio Marques
MERGE test.txt --- updated-to: 6e7899c8ef47ba349e85ab23ca21ee36f0fabe01 2015-05-08 19:17:27 UTC leaf: open tags: trunk comment: new version of test (user: abiliojr) changes: 1 file modified. Tha

Re: [fossil-users] About the help command

2015-05-08 Thread Abilio Marques
Ohhh, I did use dbstat the other day (several times actually) while working with some binary files. But yeah, I know there is the -a list, plus the hidden list. But I'm still happy to know that almost everything I use is at hand, and that I don't need a cryptic combination or plainly wrong named co

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread jungle Boogie
Hi Abilio, On 7 May 2015 at 19:19, Abilio Marques wrote: > T > his is a thing I normally go through, and I believe is a silly question, but > I've read the entire help once again looking for it, and didn't find it. > Sometimes I do things like: > > $fossil update d04e > UPDATE test.txt > -

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread Abilio Marques
I normally undo or stash... I was just checking if I had missed something ;) On Fri, May 8, 2015 at 2:21 PM, Warren Young wrote: > On May 8, 2015, at 12:32 PM, Andy Bradford > wrote: > > > > fossil undo > > Or “fossil stash”, if you don’t want your work thrown away, but can’t > check it in yet.

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread Warren Young
On May 8, 2015, at 12:32 PM, Andy Bradford wrote: > > fossil undo Or “fossil stash”, if you don’t want your work thrown away, but can’t check it in yet. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread Andy Bradford
Thus said "Andy Bradford" on 08 May 2015 12:32:22 -0600: > fossil undo I just realized that you could probably just use: fossil undo -n And it will show you what will be undone rather than actually performing it. Andy -- TAI64 timestamp: 4000554d042c ___

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread Andy Bradford
Thus said Abilio Marques on Thu, 07 May 2015 21:49:34 -0430: > And the report says: UPDATE test.txt (1 file modified)... Is there any > way to request that information again. Which is the easiest way? I don't know if there's a way, however, if you you do: fossil update abcd fossil undo fossil up

Re: [fossil-users] About the help command

2015-05-08 Thread Warren Young
On May 7, 2015, at 9:23 PM, Abilio Marques wrote: > > One of the things I LOVE about fossil is the simplicity. No weird, > ultra-hidden cryptic commands that you would use once, perhaps twice in your > lifetime Oh, that’s not true. You may have never said “fossil help -a”, and if you have, I

Re: [fossil-users] [fossil changes] and execute/symlink flag changes

2015-05-08 Thread Warren Young
On May 7, 2015, at 6:21 PM, Andy Goth wrote: > > many times I've unwittingly checked in a > bunch of execute or symlink brokenness This frequently happens to me on Windows under Cygwin due to the historical use of the archive attribute to emulate the execute bit. An explicit chmod seems to ov

Re: [fossil-users] Lost in the commands and options

2015-05-08 Thread Warren Young
On May 7, 2015, at 8:19 PM, Abilio Marques wrote: > > $fossil update d04e > UPDATE test.txt > --- > updated-to: d04e6ed4bf368421613d5c7183a7a7c037811f64 2015-05-08 01:51:33 UTC > leaf: open > tags: trunk

[fossil-users] fossil command exit codes

2015-05-08 Thread paul
Hi, Some fossil commands when they fail return an exit code of 1 but others return 0. For example, if I try to clone a repository over my network but disconnect my network, clone fails and returns an exit code of 1. If I pull or push with a disconnected network an exit code of 0 is returne

Re: [fossil-users] About the help command

2015-05-08 Thread Stephan Beal
Very briefly (finger still hurts)... On Fri, May 8, 2015 at 10:45 AM, Kain Abel wrote: > > - introducing a new shortcut 'st' for status (svn compatibility and > overriding stash) > LOL! "st" used to be the short form of "status" until the "st"ash was added, at which point "st" became ambiguous.

Re: [fossil-users] About the help command

2015-05-08 Thread Kain Abel
Thank you for opening this thread. I've found some other items on command line help... Here are a few things perhaps worthy to discuss: - exposing abbreviation like ci, co on default help page (the currently only listed with 'fossil help -a') to avoid unexpected results (co (checkout) vs. _co_m