Re: 2.3 new behaviour wrt external changes of .lyx file

2018-02-24 Thread Pavel Sanda
Scott Kostyshak wrote:
> > > I propose that we drop the '*' modification flag and let only the warning
> > > about external modification. That way one can easily see whether there is
> > > merge problem because file got edited meanwhile or just reload is enough.
> > > 
> > > Opinions?
> > > 
> > > Pavel
> > 
> > +1
> 
> That makes sense. I think I encountered this exact same confusion
> before, but did not realize that the * is always added.

Patch is attached. Will commit unless there is some objection. Pavel
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 7cabe6fce1..1c186deeaf 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -5293,7 +5293,6 @@ void Buffer::Impl::fileExternallyModified(bool const 
exists)
   "checksum unchanged: " << filename);
return;
}
-   lyx_clean = bak_clean = false;
// If the file has been deleted, only mark the file as dirty since it is
// pointless to prompt for reloading. If later a file is moved into this
// location, then the externally modified warning will appear then.


Re: 2.3 new behaviour wrt external changes of .lyx file

2018-02-23 Thread Scott Kostyshak
On Fri, Feb 23, 2018 at 01:03:52PM +, Kornel Benko wrote:

> > I propose that we drop the '*' modification flag and let only the warning
> > about external modification. That way one can easily see whether there is
> > merge problem because file got edited meanwhile or just reload is enough.
> > 
> > Opinions?
> > 
> > Pavel
> 
> +1

That makes sense. I think I encountered this exact same confusion
before, but did not realize that the * is always added.

Scott


signature.asc
Description: PGP signature


Re: 2.3 new behaviour wrt external changes of .lyx file

2018-02-23 Thread Kornel Benko
Am Freitag, 23. Februar 2018 13:48:26 CET schrieb Pavel Sanda :
> Hi,
> 
> I see new behaviour when .lyx is externally modified while being loaded in
> lyx. It is automatically flagged as modified no matter whether the file was
> modified inside lyx before external modification.
> 
> This typically happens when (r)syncing file between computers. I used to
> know when sync happen and would close the file or reload it.
> The new behaviour is somewhat confusing because I'm not capable to
> distinguish whether I mistakenly edited the file meanwhile (and really need
> to pay attention) or whether no change was actualy done and just external
> change happened.
> 
> I propose that we drop the '*' modification flag and let only the warning
> about external modification. That way one can easily see whether there is
> merge problem because file got edited meanwhile or just reload is enough.
> 
> Opinions?
> 
> Pavel

+1

Kornel