Re: Resolve conflict dialog has button Resolved disabled and resolving changes are made to temp location
Be aware that your network session can timeout while you are editing the item to resolve it. This can lead to spurious network errors, if you then try to resolve another item in the list. I have found it best to mark the conflicts Resolve Later, then exit the update/merge dialog. Then resolve the conflicts. I think this may also avoid the temporary files issue you are seeing. Tony On Friday, 2 February 2018 21:13:28 UTC+11, Ko Paka wrote: > > > Hello Stefan, > > Thank you for response and explanation - next time I will take it into > account. But I still prefer edit and resolve conflicts during merge - it > keep merge running and I can often do merge in one try. When a tool for > edit conflict is used, it handles files correctly(or better say svn give > correct parameters). But some time ago I run into some bigger problems > during merge and need to solve it by hand. And then I figured out, that it > is possible, but one must repair file placed in temp. location. > > tomas > > > > On Monday, January 29, 2018 at 10:14:43 PM UTC+1, Stefan wrote: >> >> >> >> On Tuesday, January 9, 2018 at 5:29:14 PM UTC+1, Ko Paka wrote: >>> >>> Hello, couple of days ago I had upgraded to TortoiseSVN 1.9.7, Build >>> 27907 - 64 Bit , 2017/08/08 19:34:38 and found out some problematic >>> behaviour I didn't notice before. >>> >>> 1. When conflict occured, Resolve conflict dialog was shown with button >>> Resolved disabled. All other buttons on dialog was enabled. When I clicked >>> Edit, editor was shown(in my case kdiff3) and button Resolved was enabled. >>> >>> 2. Target file - one to be resolved - was located in Temp directory of >>> currently logged user(win 10). >>> >>> >>> >>> I needed to resolve some problems manually. And found it very confusing: >>> >>> a) I need to click on Edit conflict button even when I want to solve >>> conflict manually. >>> >> >> No, if you want to resolve the conflict manually, just click on "Resolve >> later". >> >> >>> >>> b) I solved it manually in working copy(there is target file with >>> conflict markers <<<,>>> and other left, right, working counterpart >>> files) but when I finally clicked on Resolved button, file was resolved by >>> the copy from Temp directory. >>> >>> >> The "Resolve" button is for marking a conflict as resolved. That's why >> it's disabled until you hit the "Edit" button. >> Just postpone the conflict dialog (simply exit it), then resolve the >> conflict manually and then use the explorer context menu to mark the >> conflict as resolved. >> >> Stefan >> > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to tortoisesvn+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/995c7eda-821e-48c4-8b5e-daec994b384d%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Resolve conflict dialog has button Resolved disabled and resolving changes are made to temp location
Hello Stefan, Thank you for response and explanation - next time I will take it into account. But I still prefer edit and resolve conflicts during merge - it keep merge running and I can often do merge in one try. When a tool for edit conflict is used, it handles files correctly(or better say svn give correct parameters). But some time ago I run into some bigger problems during merge and need to solve it by hand. And then I figured out, that it is possible, but one must repair file placed in temp. location. tomas On Monday, January 29, 2018 at 10:14:43 PM UTC+1, Stefan wrote: > > > > On Tuesday, January 9, 2018 at 5:29:14 PM UTC+1, Ko Paka wrote: >> >> Hello, couple of days ago I had upgraded to TortoiseSVN 1.9.7, Build >> 27907 - 64 Bit , 2017/08/08 19:34:38 and found out some problematic >> behaviour I didn't notice before. >> >> 1. When conflict occured, Resolve conflict dialog was shown with button >> Resolved disabled. All other buttons on dialog was enabled. When I clicked >> Edit, editor was shown(in my case kdiff3) and button Resolved was enabled. >> >> 2. Target file - one to be resolved - was located in Temp directory of >> currently logged user(win 10). >> >> >> >> I needed to resolve some problems manually. And found it very confusing: >> >> a) I need to click on Edit conflict button even when I want to solve >> conflict manually. >> > > No, if you want to resolve the conflict manually, just click on "Resolve > later". > > >> >> b) I solved it manually in working copy(there is target file with >> conflict markers <<<,>>> and other left, right, working counterpart >> files) but when I finally clicked on Resolved button, file was resolved by >> the copy from Temp directory. >> >> > The "Resolve" button is for marking a conflict as resolved. That's why > it's disabled until you hit the "Edit" button. > Just postpone the conflict dialog (simply exit it), then resolve the > conflict manually and then use the explorer context menu to mark the > conflict as resolved. > > Stefan > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to tortoisesvn+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/10dfedcc-a037-4a66-adf5-777971e837d1%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: Resolve conflict dialog has button Resolved disabled and resolving changes are made to temp location
On Tuesday, January 9, 2018 at 5:29:14 PM UTC+1, Ko Paka wrote: > > Hello, couple of days ago I had upgraded to TortoiseSVN 1.9.7, Build 27907 > - 64 Bit , 2017/08/08 19:34:38 and found out some problematic behaviour I > didn't notice before. > > 1. When conflict occured, Resolve conflict dialog was shown with button > Resolved disabled. All other buttons on dialog was enabled. When I clicked > Edit, editor was shown(in my case kdiff3) and button Resolved was enabled. > > 2. Target file - one to be resolved - was located in Temp directory of > currently logged user(win 10). > > > > I needed to resolve some problems manually. And found it very confusing: > > a) I need to click on Edit conflict button even when I want to solve > conflict manually. > No, if you want to resolve the conflict manually, just click on "Resolve later". > > b) I solved it manually in working copy(there is target file with conflict > markers <<<,>>> and other left, right, working counterpart files) > but when I finally clicked on Resolved button, file was resolved by the > copy from Temp directory. > > The "Resolve" button is for marking a conflict as resolved. That's why it's disabled until you hit the "Edit" button. Just postpone the conflict dialog (simply exit it), then resolve the conflict manually and then use the explorer context menu to mark the conflict as resolved. Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to tortoisesvn+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/9a0e1c1c-e6f8-4c68-851f-ce18d6385ee7%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
