← Back to context

Comment by themafia

2 days ago

> by queueing pushed changes locally

And if you and another developer make conflicting changes while offline? What should happen when you return online?

The same thing as in git: you're not allowed to push your changes to the server until you have resolved the conflicts locally.

E.g. with current svn you get the latest changes from the server, open a diff editor, fix the conflicts and then commit.

The only difference here between svn and git is that svn merges the 'commit' and 'push' operations into one, e.g. instead of not being allowed to push, you're not allowed to commit in svn if there are pending conflicts.

This would be the part that would need to change if svn would get a proper 'offline mode', e.g. commits would need to go into some sort of 'local staging queue' until you get internet access back, and conflict resolutions would need to happen on the commits in that staging queue. But I really doubt if that's worth the hassle because how often are you actually without internet while coding?