Mercurial > hg > dav / changelog

added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options

• Fri, 18 Mar 2016 12:38:30 +0100
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Fri, 18 Mar 2016 12:38:30 +0100] rev 219
• added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options

automatically remove deleted conflict files from the db

• Thu, 17 Mar 2016 22:02:15 +0100
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Thu, 17 Mar 2016 22:02:15 +0100] rev 218
• automatically remove deleted conflict files from the db

added resolve-conflicts and delete-conflicts commands

• Thu, 17 Mar 2016 21:11:19 +0100
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Thu, 17 Mar 2016 21:11:19 +0100] rev 217
• added resolve-conflicts and delete-conflicts commands
  
  resolve-conflicts just removes the conflicts from the db and the next push would upload these files
  delete-conflicts removes the conflics from the db and deletes the local files

dav-sync push ignores conflict files

• Thu, 17 Mar 2016 20:24:37 +0100
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Thu, 17 Mar 2016 20:24:37 +0100] rev 216
• dav-sync push ignores conflict files