Re: [PATCH] Make sure resolving a conflict with `svn_wc_conflict_choose_merged' can't break the workqueue by referencing a non-existing file

Thank you for your reply. > Should we copy file permission bits as well as content? > For example, with the svn_io_copy_perms() function? As far as I can see the subsequent OP_FILE_INSTALL will not copy permissions, so copying permissions for the temporary file is not going to change the behavior

Re: [PATCH] Make sure resolving a conflict with `svn_wc_conflict_choose_merged' can't break the workqueue by referencing a non-existing file

On Thu, Apr 21, 2022 at 08:25:32PM +0300, Sergey Raevskiy wrote: > I've noticed that in some cases a working copy can become inoperable > after merge text conflict resolution with `svn_wc_conflict_choose_merged' > option. > > The problem can occur in the following scenario: > > 1. There is a te

[PATCH] Make sure resolving a conflict with `svn_wc_conflict_choose_merged' can't break the workqueue by referencing a non-existing file

I've noticed that in some cases a working copy can become inoperable after merge text conflict resolution with `svn_wc_conflict_choose_merged' option. The problem can occur in the following scenario: 1. There is a text conflict, that is resolved with `svn_wc_conflict_choose_merged' option