Merging, Cherry-Picking, Adding Files and Tree Conflicts

2014-07-25 Thread Wilks, Dan
I'm getting an unexpected conflict when trying to refresh a branch from the trunk after having a) merged that branch back to the trunk; b) continued bug fixing on that branch and cherry-picking those changes to the trunk; c) adding a file on the branch and having that file cherry-picked to the t

Re: http-request PUT

2014-07-25 Thread merch store
okay i found my mistake... in the X-SVN-Version-Name i've put a ' ' around the revision... because of that svn couldn't read it therefor the error... thanks for the help 2014-07-25 10:39 GMT+02:00 merch store : > i searched for a library to do this process but i couldn't find one > the only lib

Re: http-request PUT

2014-07-25 Thread Branko Čibej
On 25.07.2014 10:39, merch store wrote: > i searched for a library to do this process but i couldn't find one > the only library which looked helpful was this > one: https://github.com/sara-nl/js-webdav-client > but it didn't help... > in case you had other libraries in mind i would be grateful to

Re: Security issue: $PATH _is_ set in pre-lock hook (Subversion 1.7)

2014-07-25 Thread Philip Martin
Julian Ruhe writes: > All of the sudden, starting somewhere prior to 1.7.13, the $PATH variable > is set, although the svnbook states > "For security reasons, the Subversion repository executes hook programs > with an empty environment—that is, no environment variables are set at all, > not even

Re: http-request PUT

2014-07-25 Thread merch store
i searched for a library to do this process but i couldn't find one the only library which looked helpful was this one: https://github.com/sara-nl/js-webdav-client but it didn't help... in case you had other libraries in mind i would be grateful to know, because since 4 to 5 days i'm searching for