reintegrate fails due to "claimed" incomplete merge-out

2014-09-03 Thread Jeremy Greene
(Not ont mailing list so please cc me) I really have tried many many things to resolve this problem — endless searching, commits, un-commits etc. But I’m stuck. I think I see the issue(subdir merge of “…bitstream"), but have tried to do —record-only merges, merges, propedits… all to no avail.

Re: no subversion.conf file after yum install on latest Fedora 20

2014-09-03 Thread Nico Kadel-Garcia
On Wed, Sep 3, 2014 at 2:52 PM, James wrote: > I am following the step by step instruction to install SVN server on > latest Fedora 20. but after Apach and SVN are install via yum install. > There is no /etc/httpd/conf.d/subversion.conf file found. I also put my > question on stackoverflow site:

Re: Commit bot without password

2014-09-03 Thread Kim Gräsman
On Wed, Sep 3, 2014 at 10:30 PM, Andreas Stieger wrote: > > Example for manipulating the revision properties of the incoming > transaction: > http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/persist-ephemeral-txnprops.py?view=markup Love it, thanks! I'll try and experiment with t

Re: Commit bot without password

2014-09-03 Thread Andreas Stieger
Hi, On 03/09/14 21:21, Kim Gräsman wrote: > On Wed, Sep 3, 2014 at 10:08 PM, Branko Čibej wrote: You could try the following trick: on the build machine, with the bot's credentials, do this: $ svn commit -m ... --with-revprop on-behalf-of=username then on the ser

Re: Commit bot without password

2014-09-03 Thread Kim Gräsman
On Wed, Sep 3, 2014 at 10:08 PM, Branko Čibej wrote: >>> You could try the following trick: on the build machine, with the bot's >>> credentials, do this: >>> >>> $ svn commit -m ... --with-revprop on-behalf-of=username >>> >>> then on the server, add a pre-commit hook script that looks at the

Re: Commit bot without password

2014-09-03 Thread Branko Čibej
On 03.09.2014 21:45, Kim Gräsman wrote: > Hi Brane, > > On Wed, Sep 3, 2014 at 9:37 PM, Branko Čibej wrote: >> On 03.09.2014 21:21, Kim Gräsman wrote: >>> Is there some way to convince Subversion to commit on a user's behalf? >>> We'd like to designate one SVN account as the commit bot account and

Re: Commit bot without password

2014-09-03 Thread Kim Gräsman
Hi Brane, On Wed, Sep 3, 2014 at 9:37 PM, Branko Čibej wrote: > On 03.09.2014 21:21, Kim Gräsman wrote: >> >> Is there some way to convince Subversion to commit on a user's behalf? >> We'd like to designate one SVN account as the commit bot account and >> let it impersonate users at will. > > You

Re: Commit bot without password

2014-09-03 Thread Branko Čibej
On 03.09.2014 21:21, Kim Gräsman wrote: > Hello, > > I'm new to the list, so forgive me if this has been discussed before. > I didn't find anything in the archives. > > At my workplace, we run a simple home-cooked "gated commit" system on > top of Subversion 1.8. Users run their working copy change

Re: no subversion.conf file after yum install on latest Fedora 20

2014-09-03 Thread Branko Čibej
On 03.09.2014 20:52, James wrote: > I am following the step by step instruction to install SVN server on > latest Fedora 20. but after Apach and SVN are install via yum install. > There is no /etc/httpd/conf.d/subversion.conf file found. I also put > my question on stackoverflow site: setup SVN se

Commit bot without password

2014-09-03 Thread Kim Gräsman
Hello, I'm new to the list, so forgive me if this has been discussed before. I didn't find anything in the archives. At my workplace, we run a simple home-cooked "gated commit" system on top of Subversion 1.8. Users run their working copy changes through a client program, it assembles all changes

no subversion.conf file after yum install on latest Fedora 20

2014-09-03 Thread James
I am following the step by step instruction to install SVN server on latest Fedora 20. but after Apach and SVN are install via yum install. There is no /etc/httpd/conf.d/subversion.conf file found. I also put my question on stackoverflow site: setup SVN server on Fedora 20 issue - Stack Overflo