Re: [ANN] SubGit 1.0.0 is released

2012-09-19 Thread Andreas Krey
On Thu, 20 Sep 2012 00:13:45 +, Nico Kadel-Garcia wrote: > Java has its uses. Replacing a full-blown, fully implemented C++ > codebase where the maintainers, who also set the API's, are all > working in C++ means entirely different models of file handling, > memory management, and maintain

Re: [ANN] SubGit 1.0.0 is released

2012-09-19 Thread Andreas Krey
On Thu, 20 Sep 2012 00:13:45 +, Nico Kadel-Garcia wrote: ... > Except, of course when it doesn't. The use of OS specific EOL, which > git does not support, and subversion keywords like $Id$ and $Author$, > which git does not support, would seem to me to be an adventure > begging to happen. Or

Re: [ANN] SubGit 1.0.0 is released

2012-09-19 Thread Nico Kadel-Garcia
On Wed, Sep 19, 2012 at 3:34 PM, Alexander Kitaev wrote: > Hello All, > > Our team is proud and delighted to announce SubGit 1.0.0 release! > New version is available for download at SubGit web site at http://subgit.com/ > > SubGit is a server-side tool for a smooth, stress-free Svn to Git > migra

RE: Apache won't start after upgrade

2012-09-19 Thread Hawkins, John
Thanks Mark. Excellent help! Thank you again. JCH From: Mark Phippard [mailto:markp...@gmail.com] Sent: Wednesday, September 19, 2012 2:02 PM To: Hawkins, John Cc: users@subversion.apache.org Subject: Re: Apache won't start after upgrade It probably means when mod_dav_svn.so is loaded it t

Re: Apache won't start after upgrade

2012-09-19 Thread Mark Phippard
It probably means when mod_dav_svn.so is loaded it then tries to load the dependent DLL's it uses. Most likely you have an older version of one or more of those DLL's in PATH. Maybe a reboot would help if PATH was changed. You can download and install Dependency Walker and then drag and drop the

Apache won't start after upgrade

2012-09-19 Thread Hawkins, John
I upgraded Collabnet SVN 1.6.3 to 1.7.6. (On Windows) Now Apache won't start The error is below. It is complaining during the load of MOD_DAV_SVN.SO. "The specified procedure could not be f ." The module is in the modules folder. Which procedure it is looking for, and where is expe

[ANN] SubGit 1.0.0 is released

2012-09-19 Thread Alexander Kitaev
Hello All, Our team is proud and delighted to announce SubGit 1.0.0 release! New version is available for download at SubGit web site at http://subgit.com/ SubGit is a server-side tool for a smooth, stress-free Svn to Git migration. SubGit lets one to set up a bidirectional Subversion to Git repl

Re: Subtree mergeinfo

2012-09-19 Thread Michael T
Varnau, Steve (Seaquest R&D hp.com> writes: > > -Original Message- [...] > > From: Stefan Sperling [mailto:stsp elego.de] > > The easiest thing to do is to just leave the mergeinfo alone and upgrade > > all clients to 1.7. This will get rid of superfluous mergeinfo > > modifications durin

Re: Subtree mergeinfo

2012-09-19 Thread Stefan Sperling
On Wed, Sep 19, 2012 at 05:55:27PM +0200, Michael T wrote: > Stefan, thanks for your reply.  Would a clean-up like I described (gathering > changesets from all mergeinfo from all subtrees within a branch and setting it >  all on the branch root) be even theoretically correct then, or am I being >

RE: Subtree mergeinfo

2012-09-19 Thread
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: Wednesday, September 19, 2012 6:26 AM > To: Michael T > Cc: users@subversion.apache.org > Subject: Re: Subtree mergeinfo > > On Wed, Sep 19, 2012 at 01:12:50PM +, Michael T wrote: > > Hello, > > > > I am aware

RE: Subtree mergeinfo

2012-09-19 Thread Michael T
Stefan Sperling elego.de> writes: > On Wed, Sep 19, 2012 at 01:12:50PM +, Michael T wrote: [...] > > We have a large project with multiple branches versioned with Subversion > > (most > > of us are using 1.6 clients at the moment).  There is a lot of merging done > > between branches, and it

RE: SVN keeps getting my AD password revoked.

2012-09-19 Thread REEDICK, ANDREW
Check for svn:externals that point to an external repository. That password prompt may be for the external repository, and you're getting locked out (of the external repo) because you are providing the wrong password for the wrong repo. From: Wendell Nichols [mailto:wc...@shaw.ca] Sent: Tuesd

Re: Subtree mergeinfo

2012-09-19 Thread Stefan Sperling
On Wed, Sep 19, 2012 at 01:12:50PM +, Michael T wrote: > Hello, > > I am aware that this is a much asked question, but since I have nonetheless > been > unable to find an answer which quite works for me I will ask it again. Feel > free to point me to a FAQ I have missed by way of answer if a

Subtree mergeinfo

2012-09-19 Thread Michael T
Hello, I am aware that this is a much asked question, but since I have nonetheless been unable to find an answer which quite works for me I will ask it again. Feel free to point me to a FAQ I have missed by way of answer if appropriate! We have a large project with multiple branches versioned wi

RE: Merging headache

2012-09-19 Thread John Maher
Don't know if this will help you or not, but I ran into some problems (still am) learning subversion. I can tell you what I learned. Someone told me that conflicts are normal, and when I looked deeper, they are 100% correct. The merge doesn't work perfect all the time. It depends on your change

Re: Merging headache

2012-09-19 Thread Stefan Sperling
On Wed, Sep 19, 2012 at 08:19:59AM +, David Aldrich wrote: > As this is rather a mess, can you suggest a way to get back to some degree of > order? I'm afraid I cannot make any reasonable suggestion at this point, sorry. I'd need more information about what really happened.

RE: Merging headache

2012-09-19 Thread David Aldrich
Hi Stefan Thanks very much for your advice, I will take careful note of it. > BTW, I'm curious why you're getting an svn:mergeinfo conflict. > That should never happen if you follow best practices. > Is this common in your environment? If so, it seems people must be doing > something quite wrong,

Re: Merging headache

2012-09-19 Thread Stefan Sperling
On Wed, Sep 19, 2012 at 07:15:40AM +, David Aldrich wrote: > Hi > > I am trying to update a branch with changes from the trunk. I am getting tree > conflicts that I do not know how to resolve. Please will someone take a look > at my console output below and advise me what to do? (For the sak

Merging headache

2012-09-19 Thread David Aldrich
Hi I am trying to update a branch with changes from the trunk. I am getting tree conflicts that I do not know how to resolve. Please will someone take a look at my console output below and advise me what to do? (For the sake of security, I have sanitised the folder names). BR David C:\SVNPro