That sounds like a bad idea to me. IMO, this is a case of good enough
getting in the way of good as far as solutions to your annoyance.
Off the top of my head, I can think of two workflow habits that may help
you:
1) set up/turn on gpg signing, so you'll be required to sign commits before
On Mon, 14 Apr 2014 02:38:14 +0200, Andy Bradford
amb-sendok-1400027895.ngamjincokhalpaij...@bradfords.org wrote:
Thus said j. van den hoff on Sun, 13 Apr 2014 18:37:56 +0200:
only after your and stephan's responses I realize that `default-user'
is _not_ initialized at the time of repo
Hi,
I use a locally modified version of fossil, where customizations are in a
separate branch. I often merge from trunk to get latest updates.
This time when I tried to merge, I got 4 conflicts indicating binary files:
$ fossil merge trunk
...
MERGE src/clone.c
* Cannot merge binary file
2014-04-14 11:20 GMT+02:00 Urmil Parikh urmilpar...@gmail.com:
I assume last time when I merged and committed these files, they got
committed as binary files.
How do I find cause of them considered as binary and how do I fix them so
that I can merge without any issues?
There are only three
I often have the same problem for a different reason. I type “f cha” and “f
com” so often that sometime instead of “f cha” I accidentally type “f com”.
What I would like to have is an extra prompt, “Are you sure (y/N)?” with No
default for commits. Since commits are irreversible, I think the
WHAT?
Oh, this is embarrassing...
All this time I've been typing something (like the word 'ACCIDENT') in the
editor thinking I have already started the commit process and I would
complete the commit when I exit the editor, so I always typed something to
know that this commit was a mistake.
On Mon, Apr 14, 2014 at 3:39 PM, Tony Papadimitriou to...@acm.org wrote:
But, in my defense, (and I just re-read it to be sure I didn't miss it)
nowhere in the help documentation (FOSSIL HELP COMMIT) or the comment in
the editor (# Enter commit message for this check-in. Lines beginning with
On Mon, Apr 14, 2014 at 3:03 PM, Tony Papadimitriou to...@acm.org wrote:
I realize, this in effect is the same as using the DIFF command with
the --BRIEF option, but CHANGES is what one expects to type when looking
for filename differences, rather than content differences, so it seems more
Le 14 avr. 2014 11:48, Stephan Beal sgb...@googlemail.com a écrit :
On Mon, Apr 14, 2014 at 3:39 PM, Tony Papadimitriou to...@acm.org wrote:
But, in my defense, (and I just re-read it to be sure I didn't miss it)
nowhere in the help documentation (FOSSIL HELP COMMIT) or the comment in
the
Hi fossil developers,
Is fossil does not support multiple lines comment?
I use this command to commit:
[fossil] commit --no-warnings --message-file [comment-file] --args [files]
The comment file have several lines (\n).
But the output of [fossil] timeline only show 1 line.
The same in the
On 4/14/14, Martin Gagnon eme...@gmail.com wrote:
Le 14 avr. 2014 11:48, Stephan Beal sgb...@googlemail.com a écrit :
On Mon, Apr 14, 2014 at 3:39 PM, Tony Papadimitriou to...@acm.org
wrote:
But, in my defense, (and I just re-read it to be sure I didn't miss it)
nowhere in the help
On 4/14/14, 9:31 PM, B Harder wrote:
[...]
Our users shouldn't need CVS, SVN, etc experience to know this. I
added documentation to clarify.
It might also be useful to add:
# (To abort the commit, leave this file unchanged)
...to the commit message, too.
--
┌─── ｄｇ＠ｃｏｗｌａｒｋ．ｃｏｍ ─
On 4/14/14, David Given d...@cowlark.com wrote:
On 4/14/14, 9:31 PM, B Harder wrote:
[...]
Our users shouldn't need CVS, SVN, etc experience to know this. I
added documentation to clarify.
It might also be useful to add:
# (To abort the commit, leave this file unchanged)
...to the commit
Hi,
This doubt has been with me for a long time, but then I kinda forgot about
the deal.
Anyway, the thing is related to the comment text introduced during the
check-in. I want the web interface to show only the first line (in the case
of a multiline) over the timeline, but then when I click on
Thus said David Given on Mon, 14 Apr 2014 22:28:07 +0100:
It might also be useful to add:
# (To abort the commit, leave this file unchanged)
I was about to point out that this wouldn't be a good idea when using
merge --cherrypick because it actually automatically includes the
Thus said Andy Bradford on Mon, 14 Apr 2014 21:40:00 -0600:
... but apparently Fossil is smart enough to figure out that even with
an uncommented line in the commit message, it still treats it as an
empty message unless you alter it!
Correction, unchanged, not empty.
Andy
--
TAI64
Thanks, Jan for hints!
I did a forced commit after removing binary-glob and now I;m able to merge
without conflicts.
On Mon, Apr 14, 2014 at 3:30 PM, Jan Nijtmans jan.nijtm...@gmail.comwrote:
2014-04-14 11:20 GMT+02:00 Urmil Parikh urmilpar...@gmail.com:
I assume last time when I merged and
The artifact view of fossil is expected to show artifact content as text
(e.g. https://www.fossil-scm.org/index.html/artifact/133f25a88f21479a), but
for index.html file under ajax folder, it renders the html code (e.g.
https://www.fossil-scm.org/index.html/artifact/144dfb6264fd55ca). I think
file
18 matches
Mail list logo
