ArneBachmann / sos

Subversion Offline Solution

Home Page:https://sos-vcs.net

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Don´t stop switch if all changes coincide with live changes

ArneBachmann opened this issue · comments

Currently the output looks like switch was OK, but has a message to use --force instead
Simply remove all matches between current file tree changes and the ones coming in from switch (or update)

Problem is that exitOnChanges will exit before switch has a chance to compare changsets, but using --force would solve the problem

But what would be the rules?

  • Local addition vs. remote add/remove is a potential conflict
  • Local modification vs. remote add/remove is a conflict
  • Local deletion can always be ignored

Have a partial workaround in place, but having local additions needs per-file comparison to remove conflict