[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kwrite-devel
Subject:    Re: kate stopped warning about changed files (but only C++ files)
From:       Dominik Haumann <dhaumann () kde ! org>
Date:       2020-02-23 12:43:00
Message-ID: CALi_srA9kRxDRLP=y=i3QiqHd=d2UNQA+c-pgJAeG87GVLN3iw () mail ! gmail ! com
[Download RAW message or body]

Hi,

facts:
- the feature is there on purpose and useful to many users (other editors
do the same)
- kate is not a replacement for a version control system
- still, there seem to be corner cases where the current behavior is not
desirable

Turning this into action: Albert, please provide a patch to make this
optional.

Best regards
Dominik


Albert Astals Cid <aacid@kde.org> schrieb am So., 23. Feb. 2020, 12:27:

> El dissabte, 22 de febrer de 2020, a les 21:06:00 CET, Sven Brauch va
> escriure:
> > Hi,
> >
> > On Saturday, 22 February 2020 17:18:31 CET Albert Astals Cid wrote:
> > > edit file
> > > git commit -a
> > > git reset --hard origin/master
> > > the file contents are gone.
> > >
> > > Yes i know that i did a git reset, but up to now kate always kept
> things for
> > > me, so I'm used to do that and then salvage the files i actually
> wanted to
> > > keep.
> >
> > sorry, I don't understand the purpose of this workflow. You do changes,
> commit
> > them, then discard the commit by going back to origin/master and then
> commit
> > those you *actually* wanted again by salvaging the files from your text
> > editor? I probably misunderstood ;)
>
> No, you did not misunderstand, I do weird shit, all i am asking is for my
> editor to not try to be a smart wannabe-clippy and just do what it's
> supposed to do, tell me the file has changed and if i want to keep the
> changes or not.
>
> I'm really fine if i have to enable a non-default option for that.
>
> Cheers,
>   Albert
>
> >
> > Anyways, if you want to restore the contents of the file to before the
> reset,
> > they are still there:
> >
> > git checkout HEAD@{1} -- <path/to/file>
> >
> > That's why kate feels free to reload the file.
> >
> > Best,
> > Sven
> >
> >
> >
>
>
>
>
>

[Attachment #3 (text/html)]

<div dir="auto">Hi,<div dir="auto"><br></div><div dir="auto">facts:</div><div \
dir="auto">- the feature is there on purpose and useful to many users (other editors \
do the same)</div><div dir="auto">- kate is not a replacement for a version control \
system</div><div dir="auto">- still, there seem to be corner cases where the current \
behavior is not desirable</div><div dir="auto"><br></div><div dir="auto">Turning this \
into action: Albert, please provide a patch to make this optional.</div><div \
dir="auto"><br></div><div dir="auto">Best regards</div><div \
dir="auto">Dominik</div><div dir="auto"><br></div></div><br><div \
class="gmail_quote"><div dir="ltr" class="gmail_attr">Albert Astals Cid &lt;<a \
href="mailto:aacid@kde.org">aacid@kde.org</a>&gt; schrieb am So., 23. Feb. 2020, \
12:27:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex">El dissabte, 22 de febrer de 2020, \
a les 21:06:00 CET, Sven Brauch va escriure:<br> &gt; Hi,<br>
&gt; <br>
&gt; On Saturday, 22 February 2020 17:18:31 CET Albert Astals Cid wrote:<br>
&gt; &gt; edit file<br>
&gt; &gt; git commit -a<br>
&gt; &gt; git reset --hard origin/master<br>
&gt; &gt; the file contents are gone.<br>
&gt; &gt; <br>
&gt; &gt; Yes i know that i did a git reset, but up to now kate always kept things \
for<br> &gt; &gt; me, so I&#39;m used to do that and then salvage the files i \
actually wanted to<br> &gt; &gt; keep.<br>
&gt; <br>
&gt; sorry, I don&#39;t understand the purpose of this workflow. You do changes, \
commit <br> &gt; them, then discard the commit by going back to origin/master and \
then commit <br> &gt; those you *actually* wanted again by salvaging the files from \
your text <br> &gt; editor? I probably misunderstood ;)<br>
<br>
No, you did not misunderstand, I do weird shit, all i am asking is for my editor to \
not try to be a smart wannabe-clippy and just do what it&#39;s supposed to do, tell \
me the file has changed and if i want to keep the changes or not.<br> <br>
I&#39;m really fine if i have to enable a non-default option for that.<br>
<br>
Cheers,<br>
   Albert<br>
<br>
&gt; <br>
&gt; Anyways, if you want to restore the contents of the file to before the reset, \
<br> &gt; they are still there:<br>
&gt; <br>
&gt; git checkout HEAD@{1} -- &lt;path/to/file&gt;<br>
&gt; <br>
&gt; That&#39;s why kate feels free to reload the file.<br>
&gt; <br>
&gt; Best,<br>
&gt; Sven<br>
&gt; <br>
&gt; <br>
&gt; <br>
<br>
<br>
<br>
<br>
</blockquote></div>



[prev in list] [next in list] [prev in thread] [next in thread]