RE: Merge problem

[John Maher]

I sent lots of details.  If you can't see them then perhaps something is buggy 
with the help system.  The conflicts were either "local add, incoming add upon 
merge" or " local delete, incoming delete upon merge"

-Original Message-
From: Stefan Sperling [mailto:s...@elego.de] 
Sent: Wednesday, September 10, 2014 7:32 AM
To: Andreas Tscharner
Cc: John Maher; Subversion help
Subject: Re: Merge problem

On Wed, Sep 10, 2014 at 10:56:42AM +, Andreas Tscharner wrote:
> 
> [snip]
> > Just wondering if anyone may have an idea how my repository got so 
> > buggered up.  I tried to merge a branch to the trunk and received 49 
> > conflicts.  2 are files that do not need to be tracked so that 
> > leaves 47.  Out of the 47 there are two problems, local add, 
> > incoming add upon merge & local delete, incoming delete upon merge.  
> > I was doing some code cleanup so it is possible I deleted the files 
> > in two different branches.
> >  But I know for certain that I did not create the same file twice.  
> > I did a diff on the first one and it is identical in both branches, 
> > easy to fix, difficult to determine how the conflict came about.  
> > The second file is different, I deleted dome code that is not needed 
> > anymore.  More work to fix.
> > With the conflict it causes the merge to fail thus making this much 
> > more time consuming to fix.  The question I have is
> 
> I don't want to offend anyone here, but such bogus merge conflicts were the 
> reason we changed to git.

Apples and oranges.

> 
> > anyone know what I could’ve done to create these false conflicts?
> > 
> Not to my knowledge...

Did you ask for help on this list when you got similar conflicts?
Any pointers to threads I could read?

I'm genuinly interested in what conflicts you were seeing and how you attempted 
to resolve them.
But I need details, handwavy statements won't help me.

RE: Merge problem

[John Maher]

Thanks for your reply Stefan.  There are no subdirs on either my trunk or 
branches.  The command I used was (from the working copy of (for example) 
https://server/svn/erp/trunk) svn merge 
https://server/svn/erp/branches/feature.  

-Original Message-
From: Stefan Sperling [mailto:s...@elego.de] 
Sent: Wednesday, September 10, 2014 4:24 AM
To: John Maher
Cc: Subversion help
Subject: Re: Merge problem

On Tue, Sep 09, 2014 at 06:48:31PM +, John Maher wrote:
> Hello
> 
> Just wondering if anyone may have an idea how my repository got so buggered 
> up.  I tried to merge a branch to the trunk and received 49 conflicts.  2 are 
> files that do not need to be tracked so that leaves 47.  Out of the 47 there 
> are two problems, local add, incoming add upon merge & local delete, incoming 
> delete upon merge.  I was doing some code cleanup so it is possible I deleted 
> the files in two different branches.  But I know for certain that I did not 
> create the same file twice.  I did a diff on the first one and it is 
> identical in both branches, easy to fix, difficult to determine how the 
> conflict came about.  The second file is different, I deleted dome code that 
> is not needed anymore.  More work to fix.  With the conflict it causes the 
> merge to fail thus making this much more time consuming to fix.  The question 
> I have is anyone know what I could've done to create these false conflicts?
> 

What are the parameters you used to run this merge?
At first glance this looks like your merge source and target are at 
non-corresponding levels in the tree, e.g. as if you merged from 
^/branches/mybranch to ^/trunk/some/subdir/of/trunk

> Result of the merge:
> --- Merging r222 through r235 into '.':
>C RotairAO_SupplierManufacturer\SupplierManufacturerTranslate.vb
>C RotairAO_SupplierManufacturer\SupplierManufacturerController.vb
>C IntuitiveUI_ItemCard_CUSTOM\CopyItem.vb
>C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.resx
>C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.designer.vb
>C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.vb
>C IntuitiveUI_ItemCard_CUSTOM\ItemCard.resx
>C IntuitiveUI_ItemCard_CUSTOM\CopyItem.resx
>C IntuitiveUI_ItemCard_CUSTOM\ItemCard.Designer.vb
>C IntuitiveUI_ItemCard_CUSTOM\CopyItem.Designer.vb
>C IntuitiveUI_ItemCard_CUSTOM\ItemCard.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.Designer.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.resx
>C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.resx
>C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.Designer.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.Designer.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.vb
>C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.resx
> AIntuitiveUI_SalesOrder_CUSTOM\SalesOrder.resx
> AIntuitiveUI_SalesOrder_CUSTOM\SalesOrder.Designer.vb
> AIntuitiveUI_SalesOrder_CUSTOM\SalesOrder.vb
>C RotairUI_SupplierManufacturer\app.config
>C Rotair_Excel\Schema.resx
>C Rotair_Excel\Schema.Designer.vb
>C Rotair_Excel\Schema.vb
>C RotairAO_RFQ\RFQVendorCharge.vb
> ARotairAO_RFQ\RFQImaging OLD.vb
>C RotairAO_RFQ\RFQVendorQuote.vb
>C RotairAO_RFQ\RFQImagingController.vb
> ARotairAO_RFQ\RFQUnindexed OLD.vb
>C RotairAO_RFQ\RFQsEmailed.vb
>C RotairAO_RFQ\RFQUnindexedController.vb
>C RotairAO_RFQ\RFQMaster.vb
>C RotairAO_RFQ\RFQVendor.vb
>C RotairAO_RFQ\RFQItemQuantity.vb
>C RotairAO_RFQ\RFQItem.vb
>C RotairAO_RFQ\IO.vb
>C Rotair_System\File.vb
> --- Merging r222 through r235 into 'RotairUI_Email':
>C RotairUI_Email\NewMessage.Designer.vb
>C RotairUI_Email\NewMessage.vb
>C RotairUI_Email\NewMessage.resx
> --- Merging r222 through r235 into '.':
>C RotairUI_RFQ\UnenteredVendorDialog.resx
>C RotairUI_RFQ\Resources
>C RotairUI_RFQ\UnenteredVendorDialog.Designer.vb
>C RotairUI_RFQ\UnenteredVendorDialog.vb
>C RotairUI_RFQ\RotairUI_RFQ.vbproj.user
>C RotairUI_RFQ\RotairUI_RFQ.suo
>C RotairDataAccess\DomainWorkOrder.vb
>C RotairDataAccess_Wrapper\DomainShipping.vb
>C RotairDialog_Screening\SelectVendor.Designer.vb
>C RotairDialog_Screening\SelectVendor.vb
>C RotairDialog_Screening\SelectVendor.resx
> --- Recording mergeinfo for merge of r222 through r235 into '.':
> U   .
> --- Recording mergeinfo for merge of r222 through r235 into 'RotairUI_Email':
> U   RotairUI_Email
> Summary of conflicts:
>   Tree conflicts: 49
> 
> Status of the files:
>   C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.vb
>   >   local add, incoming add upon merge
> Summary of conflicts:
>   Tree conflicts: 1
>   C IntuitiveUI_ItemCard_CUSTOM\ItemCard.resx
>   >   local add, incoming add upon merge
> Summary of conflicts:
>   Tree conflicts: 1
>   C IntuitiveUI_ItemCard_CUSTOM\Cop

AW: Merge problem

[Markus Schaber]

Hi, John,

I guess Stefans question for more details was directed to Andreas and his 
rather unspecific rant, not to your email.

Best regards

Markus Schaber

CODESYS® a trademark of 3S-Smart Software Solutions GmbH

Inspiring Automation Solutions

3S-Smart Software Solutions GmbH
Dipl.-Inf. Markus Schaber | Product Development Core Technology
Memminger Str. 151 | 87439 Kempten | Germany
Tel. +49-831-54031-979 | Fax +49-831-54031-50

E-Mail: m.scha...@codesys.com | Web: http://www.codesys.com | CODESYS store: 
http://store.codesys.com
CODESYS forum: http://forum.codesys.com

Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade 
register: Kempten HRB 6186 | Tax ID No.: DE 167014915

This e-mail may contain confidential and/or privileged information. If you are 
not the intended recipient (or have received
this e-mail in error) please notify the sender immediately and destroy this 
e-mail. Any unauthorised copying, disclosure
or distribution of the material in this e-mail is strictly forbidden.

> -Ursprüngliche Nachricht-
> Von: John Maher [mailto:jo...@rotair.com]
> Gesendet: Donnerstag, 11. September 2014 13:51
> An: Stefan Sperling; Andreas Tscharner
> Cc: Subversion help
> Betreff: RE: Merge problem
> 
> I sent lots of details.  If you can't see them then perhaps something is
> buggy with the help system.  The conflicts were either "local add, incoming
> add upon merge" or " local delete, incoming delete upon merge"
> 
> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de]
> Sent: Wednesday, September 10, 2014 7:32 AM
> To: Andreas Tscharner
> Cc: John Maher; Subversion help
> Subject: Re: Merge problem
> 
> On Wed, Sep 10, 2014 at 10:56:42AM +, Andreas Tscharner wrote:
> >
> > [snip]
> > > Just wondering if anyone may have an idea how my repository got so
> > > buggered up.  I tried to merge a branch to the trunk and received 49
> > > conflicts.  2 are files that do not need to be tracked so that
> > > leaves 47.  Out of the 47 there are two problems, local add,
> > > incoming add upon merge & local delete, incoming delete upon merge.
> > > I was doing some code cleanup so it is possible I deleted the files
> > > in two different branches.
> > >  But I know for certain that I did not create the same file twice.
> > > I did a diff on the first one and it is identical in both branches,
> > > easy to fix, difficult to determine how the conflict came about.
> > > The second file is different, I deleted dome code that is not needed
> > > anymore.  More work to fix.
> > > With the conflict it causes the merge to fail thus making this much
> > > more time consuming to fix.  The question I have is
> >
> > I don't want to offend anyone here, but such bogus merge conflicts were the
> reason we changed to git.
> 
> Apples and oranges.
> 
> >
> > > anyone know what I could’ve done to create these false conflicts?
> > >
> > Not to my knowledge...
> 
> Did you ask for help on this list when you got similar conflicts?
> Any pointers to threads I could read?
> 
> I'm genuinly interested in what conflicts you were seeing and how you
> attempted to resolve them.
> But I need details, handwavy statements won't help me.

Re: Merge problem

[Stefan Sperling]

On Thu, Sep 11, 2014 at 11:56:22AM +, John Maher wrote:
> Thanks for your reply Stefan.  There are no subdirs on either my trunk or 
> branches.  The command I used was (from the working copy of (for example) 
> https://server/svn/erp/trunk) svn merge 
> https://server/svn/erp/branches/feature.  

OK, that's fine.
So you're merging from the branch into the trunk, right?

Perhaps the merge is merging changes which have been previously
merged into the trunk but not recorded as merged in mergeinfo?
E.g. if a revsision between r222 and r235 added the file
RotairAO_SupplierManufacturer\SupplierManufacturerTranslate.vb
on your branch, and the trunk already merged that revision from
your branch -- but mergeinfo claims this was not the case -- then
I would expect the conflict you are seeing. The question is then,
how come the change was merged but not recorded? Did the person
doing the merge forget to commit the svn:mergeinfo property changes,
perhaps?

Another possiblity is that the same file was added on the
trunk independently, i.e. not via a merge operation, but for
some other reason.

Can you trace back the history of this file both on your branch
and the trunk with 'svn log' to see how they came into existence?

> 
> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de] 
> Sent: Wednesday, September 10, 2014 4:24 AM
> To: John Maher
> Cc: Subversion help
> Subject: Re: Merge problem
> 
> On Tue, Sep 09, 2014 at 06:48:31PM +, John Maher wrote:
> > Hello
> > 
> > Just wondering if anyone may have an idea how my repository got so buggered 
> > up.  I tried to merge a branch to the trunk and received 49 conflicts.  2 
> > are files that do not need to be tracked so that leaves 47.  Out of the 47 
> > there are two problems, local add, incoming add upon merge & local delete, 
> > incoming delete upon merge.  I was doing some code cleanup so it is 
> > possible I deleted the files in two different branches.  But I know for 
> > certain that I did not create the same file twice.  I did a diff on the 
> > first one and it is identical in both branches, easy to fix, difficult to 
> > determine how the conflict came about.  The second file is different, I 
> > deleted dome code that is not needed anymore.  More work to fix.  With the 
> > conflict it causes the merge to fail thus making this much more time 
> > consuming to fix.  The question I have is anyone know what I could've done 
> > to create these false conflicts?
> > 
> 
> What are the parameters you used to run this merge?
> At first glance this looks like your merge source and target are at 
> non-corresponding levels in the tree, e.g. as if you merged from 
> ^/branches/mybranch to ^/trunk/some/subdir/of/trunk
> 
> > Result of the merge:
> > --- Merging r222 through r235 into '.':
> >C RotairAO_SupplierManufacturer\SupplierManufacturerTranslate.vb
> >C RotairAO_SupplierManufacturer\SupplierManufacturerController.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CopyItem.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.resx
> >C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.vb
> >C IntuitiveUI_ItemCard_CUSTOM\ItemCard.resx
> >C IntuitiveUI_ItemCard_CUSTOM\CopyItem.resx
> >C IntuitiveUI_ItemCard_CUSTOM\ItemCard.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CopyItem.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\ItemCard.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.resx
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.resx
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.resx
> > AIntuitiveUI_SalesOrder_CUSTOM\SalesOrder.resx
> > AIntuitiveUI_SalesOrder_CUSTOM\SalesOrder.Designer.vb
> > AIntuitiveUI_SalesOrder_CUSTOM\SalesOrder.vb
> >C RotairUI_SupplierManufacturer\app.config
> >C Rotair_Excel\Schema.resx
> >C Rotair_Excel\Schema.Designer.vb
> >C Rotair_Excel\Schema.vb
> >C RotairAO_RFQ\RFQVendorCharge.vb
> > ARotairAO_RFQ\RFQImaging OLD.vb
> >C RotairAO_RFQ\RFQVendorQuote.vb
> >C RotairAO_RFQ\RFQImagingController.vb
> > ARotairAO_RFQ\RFQUnindexed OLD.vb
> >C RotairAO_RFQ\RFQsEmailed.vb
> >C RotairAO_RFQ\RFQUnindexedController.vb
> >C RotairAO_RFQ\RFQMaster.vb
> >C RotairAO_RFQ\RFQVendor.vb
> >C RotairAO_RFQ\RFQItemQuantity.vb
> >C RotairAO_RFQ\RFQItem.vb
> >C RotairAO_RFQ\IO.vb
> >C Rotair_System\File.vb
> > --- Merging r222 through r235 into 'RotairUI_Email':
> >C RotairUI_Email\NewMessage.Designer.vb
> >C RotairUI_Email\NewMessage.vb
> >C

Re: Merge problem

[Stefan Sperling]

On Thu, Sep 11, 2014 at 12:03:36PM +, Markus Schaber wrote:
> Hi, John,
> 
> I guess Stefans question for more details was directed to Andreas and his 
> rather unspecific rant, not to your email.

Correct :)

RE: Merge problem

[John Maher]

Thanks Stefan, I found the problem, it was me.  First off I am the only 
developer here, so I suspected I did something.  I also try to leave meaningful 
comments which helped out in this case.  After reading the comments produced by 
the log command I remember seeing some files that subversion 'forgot' to add.  
I do not know why it decided not to add them but now I remember adding them and 
feeling déjà-vu.  I presumed it was just too much whiskey on the holiday 
weekend.  Add to that the fact I have had other problems with subversion I 
guessed incorrectly that something was wrong.  But with the log command I see a 
record of me adding the files with a comment and doing the same thing a week 
later with a different but similar comment.  So I believe the messages from the 
merge command are accurate.  And since I made the branch from a trunk missing 
files the branch naturally was missing the same files.

Not sure why they never got added in the first place, but thanks for your help. 
 I think I will punish the perpetrator and send them home early!


-Original Message-
From: Stefan Sperling [mailto:s...@elego.de] 
Sent: Thursday, September 11, 2014 2:09 PM
To: John Maher
Cc: Subversion help
Subject: Re: Merge problem

On Thu, Sep 11, 2014 at 11:56:22AM +, John Maher wrote:
> Thanks for your reply Stefan.  There are no subdirs on either my trunk or 
> branches.  The command I used was (from the working copy of (for example) 
> https://server/svn/erp/trunk) svn merge 
> https://server/svn/erp/branches/feature.  

OK, that's fine.
So you're merging from the branch into the trunk, right?

Perhaps the merge is merging changes which have been previously merged into the 
trunk but not recorded as merged in mergeinfo?
E.g. if a revsision between r222 and r235 added the file 
RotairAO_SupplierManufacturer\SupplierManufacturerTranslate.vb
on your branch, and the trunk already merged that revision from your branch -- 
but mergeinfo claims this was not the case -- then I would expect the conflict 
you are seeing. The question is then, how come the change was merged but not 
recorded? Did the person doing the merge forget to commit the svn:mergeinfo 
property changes, perhaps?

Another possiblity is that the same file was added on the trunk independently, 
i.e. not via a merge operation, but for some other reason.

Can you trace back the history of this file both on your branch and the trunk 
with 'svn log' to see how they came into existence?

> 
> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de]
> Sent: Wednesday, September 10, 2014 4:24 AM
> To: John Maher
> Cc: Subversion help
> Subject: Re: Merge problem
> 
> On Tue, Sep 09, 2014 at 06:48:31PM +, John Maher wrote:
> > Hello
> > 
> > Just wondering if anyone may have an idea how my repository got so buggered 
> > up.  I tried to merge a branch to the trunk and received 49 conflicts.  2 
> > are files that do not need to be tracked so that leaves 47.  Out of the 47 
> > there are two problems, local add, incoming add upon merge & local delete, 
> > incoming delete upon merge.  I was doing some code cleanup so it is 
> > possible I deleted the files in two different branches.  But I know for 
> > certain that I did not create the same file twice.  I did a diff on the 
> > first one and it is identical in both branches, easy to fix, difficult to 
> > determine how the conflict came about.  The second file is different, I 
> > deleted dome code that is not needed anymore.  More work to fix.  With the 
> > conflict it causes the merge to fail thus making this much more time 
> > consuming to fix.  The question I have is anyone know what I could've done 
> > to create these false conflicts?
> > 
> 
> What are the parameters you used to run this merge?
> At first glance this looks like your merge source and target are at 
> non-corresponding levels in the tree, e.g. as if you merged from 
> ^/branches/mybranch to ^/trunk/some/subdir/of/trunk
> 
> > Result of the merge:
> > --- Merging r222 through r235 into '.':
> >C RotairAO_SupplierManufacturer\SupplierManufacturerTranslate.vb
> >C RotairAO_SupplierManufacturer\SupplierManufacturerController.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CopyItem.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.resx
> >C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CreateItemRev.vb
> >C IntuitiveUI_ItemCard_CUSTOM\ItemCard.resx
> >C IntuitiveUI_ItemCard_CUSTOM\CopyItem.resx
> >C IntuitiveUI_ItemCard_CUSTOM\ItemCard.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\CopyItem.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\ItemCard.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.Designer.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_ItemCard_CUSTOM.vb
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CreateItemRev_CUSTOM.resx
> >C IntuitiveUI_ItemCard_CUSTOM\UI_CopyItem_CUSTOMx.resx
> >C IntuitiveUI_ItemCard_CUSTOM\UI_Create

Re: Missing update-report close tag on CheckOut

[Lloyd]

I ran "svnadmin verify *repository_dir*" and it shows everything is ok (
"verified revision 312" and exits cleanly without any error).

As the next step I have checked the event logs of visual svn server. It
shows

Cant open file D:\\Repositories\\myProj\\db\\revprops\\0\\28: access
denied. [500, #720005]
Event ID: 1001, Task Category : Apache

Another entry is-

Provider encountered an error while streaming a REPORT response [500, #0]

so from this what I guess is some file permissions are unexpectedly
changed. Is there any way I can change it back to its original permissions?
(I have no idea about for which user the permission need to be changed)


I have also tried to checkout the repository from linux, and I get this
error -

REPORT of 'svn/NeSA/!svn/vcc/default': could not read chunk size: Secure
connection truncated (https://rccf-rsrv)


Any help or hint is greatly appreciated.

Thanks,
 Lloyd







On Mon, May 5, 2014 at 11:54 AM, David Chapman  wrote:

>  On 5/4/2014 10:57 PM, Lloyd wrote:
>
>  Hi
> We are using VisualSVN server version 2.1.4 (svn server version 1.6.13)
> When I try to checkout our project it throws an error message "svn:
> E175009: Missing update-report close tag". What could be the reason for
> this error message?
>
>  Can something could be corrupt in our server? If so is there any tool to
> verify and correct our repository?
>
>
> Try "svnadmin verify *repository_dir*" on the server machine.  If that
> reports a problem, describe it here and you might get information on how to
> repair it.
>
> For example, I routinely run "svnadmin verify /var/www/html/svn/repo" on
> my server.  This requires read privilege on all directories in the
> repository, of course, so I run it as root.
>
> --
> David Chapman  dcchap...@acm.org
> Chapman Consulting -- San Jose, CA
> Software Development Done Right.
> www.chapman-consulting-sj.com
>
>

Proxy settings in SVN

[Vaux, John]

Hello all,
It's my first time posting to this list and I am not subscribed 
so please CC me on any replies.

I'm having difficulty with the proxy settings in Windows 
version of svn (I'm using the WANdisco compiled version).  It seems as though 
no matter what I put in the appdata\roaming\subversion\servers file the 
settings are ignored and the svn is defaulting to the windows control panel 
settings.  This would be fine but we utilize a proxy.pac autoconfigure and 
require proxy authentication.  Between those two settings for whatever reason 
svn seems to be unable to deal with the proxy's request for authentication.  
I've tcpdumped the connection information from the proxy itself and it looks 
like svn just isn't answering.

The basic gist of the stream goes like this:
Source  Dest   Protocol   
Length  Message
clientIP proxyIPHTTP  121   
  CONNECT www.svnrepository.tld:443 HTTP/1.1
proxyIPclientIP HTTP  236   
  HTTP/1.1 407 authenticationrequired  (text/html)
clientIP proxyIPHTTP  217   
  CONNECT www.svnrepository.tld:443 HTTP/1.1 , 
NTLMSSP_NEGOTIATE
proxyIPclientIP HTTP  252   
  HTTP/1.1 407 authenticationrequired , NTLMSSP_CHALLENGE 
(text/html)

And then silence.  The app correctly interprets the first 407 and tries 
connecting again but this time with an NTLMSSP_NEGOTIATE but when the proxy 
comes back with a CHALLENGE svn never responds with credentials.  I worked with 
my proxy vendor and we tried to find ways around it but short of turning off 
authentication they are chalking it up to a bug in the HTTP client 
implementation.  Any help would be much appreciated.

John Vaux
Enterprise Infrastructure Architect
Information Technology Services
Phoenix Children's Hospital
Office: 602-933-2592
Mobile: 602-501-3052
jv...@phoenixchildrens.com



This transmission, including any attachments, is for the sole use of the 
intended recipient (s) and may contain information that is confidential, 
proprietary, legally privileged, or otherwise protected by law from disclosure. 
Any unauthorized review, use, copying, disclosure, or distribution is 
prohibited.  If you are not the intended recipient, or the person responsible 
for delivering this to an addressee, you should notify the sender immediately 
by telephone or by reply e-mail, and destroy all copies of the original message.