[fossil-users] revert all files: doesn't work

2015-07-18 Thread Svyatoslav Mishyn
Hello, from `fossil help revert` ... "Revert all files if no file name is provided." and here is my test: /home/juef/tmp/fossil/test: f time === 2015-07-18 === 18:55:39 [b0d58a9f51] *CURRENT* c3 (user: juef tags: trunk) 18:55:16 [b2f66fde1a] c2 (user: juef tags: trunk) 18:54:52 [4deb08b494] c1

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Jan Danielsson
On 18/07/15 17:09, Scott Robison wrote: > Still on phone. Instead of -euser how about -author? Instinctively seems > less clumsy but it's just a knee-jerk reaction to -euser which seems both > long and short simultaneously. :) I agree x 2. -- Kind Regards, Jan

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Scott Robison
Still on phone. Instead of -euser how about -author? Instinctively seems less clumsy but it's just a knee-jerk reaction to -euser which seems both long and short simultaneously. :) On Jul 18, 2015 8:35 AM, "Stephan Beal" wrote: > > > On Sat, Jul 18, 2015 at 4:29 PM, Andy Bradford > wrote: > >> I

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Stephan Beal
On Sat, Jul 18, 2015 at 4:48 PM, Andy Bradford wrote: > What is your opinion on making the default action of the command without > any options imply -e? I think I could be convinced that this should be > the default option if none specified as Sergei and Scott have argued. > That would actua

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Andy Bradford
Thus said Sergei Gavrikov on Sat, 18 Jul 2015 12:10:42 +0300: > However, with a forest the options Fossil CLI increasingly resembles > Git CLI :-) Perhaps then, ``amend'' should only have short options where ``commit'' has short options? I think this should be the case just so people who us

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Andy Bradford
Thus said Stephan Beal on Sat, 18 Jul 2015 16:35:46 +0200: > -e|--edit-comment Launch editor to revise comment > > i know my own most-used will be -e, but i like -m (as mentioned > earlier) for this: -m|-comment for symmetry with commit. #2 would be > tagging, #3 would be the t

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Stephan Beal
On Sat, Jul 18, 2015 at 4:29 PM, Andy Bradford wrote: > It doesn't have to be euser, but the rational there was for edited user. > Have another suggestion? > No better suggestion - euser matches the event table, too. > > -s|--close > > > > just so that the short-form flag is a letter in the wo

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Andy Bradford
Thus said Sergei Gavrikov on Sat, 18 Jul 2015 15:18:09 +0300: > Back to amend's options. Short counter-part for `--comment' option > would be `-m' option. The fossil commit command uses `-m'. Yes, much better suggestion, thank you. I'll take a look at the commit command and see how many

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Andy Bradford
Thus said Scott Robison on Fri, 17 Jul 2015 22:20:35 -0600: > On phone, apologies for top posting. To me "amend " should > behave as much as possible like "commit", though I can appreciate that > some might disagree. Is the primary purpose, or most frequent use, of the amend subcommand to e

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Andy Bradford
Thus said Stephan Beal on Sat, 18 Jul 2015 09:46:40 +0200: > Why is 'e'user needed? Is there a global flag for --user which > collides with it? Yes, unfortunately there is the global --user option with which it collides. Setting it causes Fossil to fail with an error about not being

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Sergei Gavrikov
On Sat, 18 Jul 2015, Stephan Beal wrote: > On Sat, Jul 18, 2015 at 11:10 AM, Sergei Gavrikov wrote: > --edit-comment option. However, with a forest the options Fossil > CLI increasingly resembles Git CLI :-) > > See: > > http://git-man-page-generator.lokaltog.net/ Of course, I have be

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Michai Ramakers
On 18 July 2015 at 11:54, Stephan Beal wrote: > On Sat, Jul 18, 2015 at 11:10 AM, Sergei Gavrikov > wrote: >> >> --edit-comment option. However, with a forest the options Fossil CLI >> increasingly resembles Git CLI :-) > > See: > > http://git-man-page-generator.lokaltog.net/ funny, nice one :-)

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Stephan Beal
On Sat, Jul 18, 2015 at 11:10 AM, Sergei Gavrikov wrote: > --edit-comment option. However, with a forest the options Fossil CLI > increasingly resembles Git CLI :-) > See: http://git-man-page-generator.lokaltog.net/ -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Sergei Gavrikov
On Fri, 17 Jul 2015, Scott Robison wrote: > On phone, apologies for top posting. To me "amend " should behave as > much as possible like "commit", though I can appreciate that some might > disagree. Then even more. The sub-command syntax shall be fossil amend ?OPTIONS? Thus, quick editing the

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Sergei Gavrikov
On Sat, 17 Jul 2015, Andy Bradford wrote: > Thus said Sergei Gavrikov on Thu, 16 Jul 2015 17:21:55 +0300: > > > I also expected that 'fossil amend ' will spawn $EDITOR with an > > original check-in message likes 'fossil commit' does. But, I met cold > > silence. Probably, to support $EDITOR for

Re: [fossil-users] Any interest in testing/merging check-in-edit branch?

2015-07-18 Thread Stephan Beal
On Sat, Jul 18, 2015 at 4:37 AM, Andy Bradford wrote: > Also, should some of these options have a short option analog, for > example: > >-u|--euser USER Make USER the check-in user > Why is 'e'user needed? Is there a global flag for --user which collides with it? -e|--edit-

Re: [fossil-users] Merging repositories

2015-07-18 Thread Zoltán Kócsi
> Is your intent to co-mingle same-named branches? I.e. if there is a > trunk in both source repos do you wish to merge both dev streams to a > single trunk? Yes. Basically, it's two source repos of two embedded gizmos. They are interrelated and share a couple of headers (protocol message formats