Optional background updates

Hello Marcus,

Done

-

Maxim Shafirov
JetBrains, Inc
http://www.jetbrains.com
"Develop with pleasure!"

Gotta love this in the new build. As much as I love the possibility of
doing an update in the background, most of the time I won't be messing
with files while IDEA is working on an update, specially since the
semantics for this weren't exactly defined yet.

http://www.jetbrains.net/jira/browse/IDEADEV-9968

Hello Marcus,

MB> Gotta love this in the new build. As much as I love the possibility
MB> of doing an update in the background, most of the time I won't be
MB> messing with files while IDEA is working on an update, specially
MB> since the semantics for this weren't exactly defined yet.

In fact there was one thing we did define: files modified during a background
commit are not saved to disk while a commit operation is still in progress.
You can continue editing the files, but you're guaranteed that your changes
will not become part of the commit.

--
Dmitry Jemerov
Software Developer
http://www.jetbrains.com/
"Develop with Pleasure!"

How is this supposed to work with TeamCity/Remote Run functionality?

In fact there was one thing we did define: files
modified during a background
commit are not saved to disk while a commit operation
is still in progress.

That's very nice to hear, Dmitry. What about files modified during an update? What happens if you modify a file during an update, and then this file is also modified by the update process?

I think it's just merged as if you had modified it before the update.
R

Hello Marcus,

>> In fact there was one thing we did define: files
>> modified during a background
>> commit are not saved to disk while a commit operation
>> is still in progress.
MB> That's very nice to hear, Dmitry. What about files modified during
MB> an update? What happens if you modify a file during an update, and
MB> then this file is also modified by the update process?

Most likely you will get the regular dialog asking you to "Keep in memory
changes" or "Load FS changes". I don't really know how this can be handled
better, given that we don't know the set of files that are going to be updated
before the update operation begins.

--
Dmitry Jemerov
Software Developer
http://www.jetbrains.com/
"Develop with Pleasure!"

Most likely you will get the regular dialog asking
you to "Keep in memory
changes" or "Load FS changes". I don't really know
how this can be handled
better, given that we don't know the set of files
that are going to be updated
before the update operation begins.

Robert Gibson hinted at how this could be better handled: IDEA could try to merge the incoming changes with the in-memory versions of the files, presenting a conflict resolve dialog if needed. I know this is probably very, very tricky, but I think it would be the "right" thing to do.

Hello Marcus,

>> Most likely you will get the regular dialog asking
>> you to "Keep in memory
>> changes" or "Load FS changes". I don't really know
>> how this can be handled
>> better, given that we don't know the set of files
>> that are going to be updated
>> before the update operation begins.
MB> Robert Gibson hinted at how this could be better handled: IDEA could
MB> try to merge the incoming changes with the in-memory versions of the
MB> files, presenting a conflict resolve dialog if needed. I know this
MB> is probably very, very tricky, but I think it would be the "right"
MB> thing to do.

Well, the standard FS/memory conflict dialog does already have a "show differences"
button - I haven't checked but I won't be surprised if it already supports
merging.

--
Dmitry Jemerov
Software Developer
http://www.jetbrains.com/
"Develop with Pleasure!"

Well, the standard FS/memory conflict dialog does
already have a "show differences"
button - I haven't checked but I won't be surprised
if it already supports
merging.

Yes, it does. But the FS/memory conflict isn't exactly the same as a svn conflict. To start with, the first doesn't try to merge non-conflicting changes, and doesn't have any concept of a common ancestor from where to determine differences.