Mercurial > hg > dav / changelog

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

dav-sync add-directory shows list of repositories

• Thu, 17 Mar 2016 15:06:26 +0100
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Thu, 17 Mar 2016 15:06:26 +0100] rev 215
• dav-sync add-directory shows list of repositories

fixed version output

• Wed, 16 Mar 2016 14:39:59 +0100
• by Olaf Wintermann <olaf.wintermann@gmail.com> [Wed, 16 Mar 2016 14:39:59 +0100] rev 214
• fixed version output