[Qlandkartegt-users] TortoiseHg problem

2017-08-17 Thread Wolfgang Thämelt
Hi, when trying to get the latest commits to my local repository the following error message appears: % hg update --config ui.merge=internal:merge --rev default --clean abgebrochen: Groß-/Kleinschreibungskonflikt zwischen src/icons/32x32/Regularscreen.png und

Re: [Qlandkartegt-users] TortoiseHg problem

2017-08-17 Thread Helmut Schmidt
I get the same error message (HG workbench on Win7) Am 17.08.2017 um 19:45 schrieb Wolfgang Thämelt: Hi, when trying to get the latest commits to my local repository the following error message appears: % hg update --config ui.merge=internal:merge --rev default --clean abgebrochen:

Re: [Qlandkartegt-users] TortoiseHg problem

2017-08-17 Thread Ivo Kronenberg
Same problem with mercurial on OS-X. On 17.08.17 20:16, Helmut Schmidt wrote: I get the same error message (HG workbench on Win7) Am 17.08.2017 um 19:45 schrieb Wolfgang Thämelt: Hi, when trying to get the latest commits to my local repository the following error message appears: % hg

Re: [Qlandkartegt-users] TortoiseHg problem

2017-08-17 Thread Ivo Kronenberg
Just delete the mentioned files RegularScreen.png (32x32 and 48x38) on your local file system and then run a hg update. On 17.08.17 20:16, Helmut Schmidt wrote: I get the same error message (HG workbench on Win7) Am 17.08.2017 um 19:45 schrieb Wolfgang Thämelt: Hi, when trying to get the