RE: The XML response contains invalid XML

2015-04-24 Thread OlePinto
Bert Huijben-5 wrote
> Just to be sure: you get this error during an update?
> 
> Not during a commit?

Yes, a merge exactly. I even get it if I try the merge with --record-only. I
was surprised to know that the client downloads the whole files, when I
thought it was a local operation (merge inside the local WC, not a remote
url).

We have tried again, with the same results. Did the /netsh int ip reset /,
restarted and it works.
I have compared the generated log ( resetlog2.txt
  ) with
the previous one (see former message). The first time it did some things it
didn't the second (as they were already done). It resets again the
IP/netmask/DNS (which we configured manually) and it prints again the only
suspicious lines we find:

We have looked for those values and they are not present right now. I will
try to look for them next monday to see if they have reappeared.

We have even exported and compared
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters],
which supposedly contains every value susceptible of being changed by the
netsh.
Apart from the lease time (present, even if we don't use DHCP) we see a
change in NTEContextList. I have two cards, an inactive TeamViewerVPN
Adapter and the real Ethernet card. They had values of 3 and 2 that, after
the enchantment and restart become 2 and 3.



--
View this message in context: 
http://subversion.1072662.n5.nabble.com/The-XML-response-contains-invalid-XML-tp186929p193112.html
Sent from the Subversion Users mailing list archive at Nabble.com.


Re: The XML response contains invalid XML

2015-04-24 Thread Andreas Mohr
On Fri, Apr 24, 2015 at 12:13:53AM -0700, OlePinto wrote:
> Bert Huijben-5 wrote
> > Just to be sure: you get this error during an update?
> > 
> > Not during a commit?
> 
> Yes, a merge exactly. I even get it if I try the merge with --record-only. I
> was surprised to know that the client downloads the whole files, when I
> thought it was a local operation (merge inside the local WC, not a remote
> url).

My strangely semi-related ("foreign universe") notes at
"Copy this Debugging HOWTO to Wiki" 
https://svnbridge.codeplex.com/workitem/15337
might help in nailing down this issue.

HTH,

Andreas Mohr

-- 
GNU/Linux. It's not the software that's free, it's you.


Re: Merge from a branch of a branch to trunk, losing files

2015-04-24 Thread Johan Corveleyn
On Tue, Apr 21, 2015 at 7:20 PM, Robert Voliva  wrote:
> Hello,
>
> I created a branch off of trunk.  Files were added to that branch.  A branch
> was created off of that branch.  Files were added/changed in that branch.
> The second branch was merged back to trunk.  The files added in the first
> branch, before the second branch was cut from it, were not included in the
> merge.
>
> Slightly more visual:
>
> trunk
> project1
> file1
> (make branch)
> branches
> branch1
> file1
> branchfile1
> (make branch of branch1)
> branch2
> file1
> branchfile1
> branchfile2
> branchfile3
>
> When you go to merge branch2 into trunk, branchfile1 is not merged.  Can
> someone explain this to me as to what is going on?  Bug in svn?
> Documentation to why you can't do this?

Hi Robert,

Sorry it took a while to get a response. However, I cannot reproduce
what you are seeing, when trying something like this with svn 1.8.11
(see below).

What version are you using? Maybe this was a bug in older versions of
svn that has since been fixed ... Alternatively, maybe I'm missing
something in my scenario. In that case, can you show a series of steps
or a transcript to reproduce this?

Below is a transcript of what I tried (I tried doing exactly what you
described above). At the end you can see that both branchfile1 (from
branch1) and branchfile2 (from branch2) are merged to trunk.

[[[
C:\Temp\svntest>svn --version -q
1.8.11

C:\Temp\svntest>svnadmin create repos

C:\Temp\svntest>svn mkdir -mm file:///c:/temp/svntest/repos/trunk
file:///c:/temp/svntest/repos/branches

Committed revision 1.

C:\Temp\svntest>svn co file:///c:/temp/svntest/repos/trunk wc-trunk
Checked out revision 1.

C:\Temp\svntest>cd wc-trunk

C:\Temp\svntest\wc-trunk>echo test > file1

C:\Temp\svntest\wc-trunk>svn add file1
A file1

C:\Temp\svntest\wc-trunk>svn ci -mm
Adding file1
Transmitting file data .
Committed revision 2.

C:\Temp\svntest\wc-trunk>cd ..

C:\Temp\svntest>svn cp -mm file:///c:/temp/svntest/repos/trunk
file:///c:/temp/svntest/repos/branches/branch1

Committed revision 3.

C:\Temp\svntest>svn co file:///c:/temp/svntest/repos/branches/branch1 wc-branch1
Awc-branch1\file1
Checked out revision 3.

C:\Temp\svntest>cd wc-branch1

C:\Temp\svntest\wc-branch1>echo test > branchfile1

C:\Temp\svntest\wc-branch1>svn add branchfile1
A branchfile1

C:\Temp\svntest\wc-branch1>svn ci -mm
Adding branchfile1
Transmitting file data .
Committed revision 4.

C:\Temp\svntest\wc-branch1>cd ..

C:\Temp\svntest>svn cp -mm
file:///c:/temp/svntest/repos/branches/branch1
file:///c:/temp/svntest/repos/branches/branch2


Committed revision 5.

C:\Temp\svntest>svn co file:///c:/temp/svntest/repos/branches/branch2 wc-branch2
Awc-branch2\branchfile1
Awc-branch2\file1
Checked out revision 5.

C:\Temp\svntest>cd wc-branch2

C:\Temp\svntest\wc-branch2>echo test > branchfile2

C:\Temp\svntest\wc-branch2>svn add branchfile2
A branchfile2

C:\Temp\svntest\wc-branch2>svn ci -mm
Adding branchfile2
Transmitting file data .
Committed revision 6.

C:\Temp\svntest\wc-branch2>cd ..\wc-trunk

C:\Temp\svntest\wc-trunk>svn merge
file:///c:/temp/svntest/repos/branches/branch2 .
svn: E195020: Cannot merge into mixed-revision working copy [1:2]; try
updating first

C:\Temp\svntest\wc-trunk>svn up
Updating '.':
At revision 6.

C:\Temp\svntest\wc-trunk>svn merge
file:///c:/temp/svntest/repos/branches/branch2 .
--- Merging r3 through r4 into '.':
Abranchfile1
--- Recording mergeinfo for merge of r3 through r4 into '.':
 U   .
--- Merging r5 through r6 into '.':
Abranchfile2
--- Recording mergeinfo for merge of r5 through r6 into '.':
 G   .

C:\Temp\svntest\wc-trunk>dir /b
branchfile1
branchfile2
file1

C:\Temp\svntest\wc-trunk>svn st
 M  .
A  +branchfile1
A  +branchfile2

C:\Temp\svntest\wc-trunk>svn ci -m"merged branch2 to trunk"
Sending.
Adding branchfile1
Adding branchfile2

Committed revision 7.
]]]

-- 
Johan


Subversion exception : diff_editor.c internal malfunction

2015-04-24 Thread McGinn, Colleen
To whom it mat concern;

I am sending this EMAIL to report a Subversion exception as requested.  I was 
using Tortoise SVN, 1.8.7 Build 25475 - 64 bit 2014/05/05 to perfom a "show 
log" functionality.  While viewing the log  I right clicked on the current 
revision of code (which was 3 revisions newer than mine) and requested "Show 
changes as unified diff".  The execution of this operation was taking a very 
long time (10 minutes?) and I still saw no result, so I decided to select 
"cancel" from the progress window.  The following error resulted:

---
Subversion Exception!
---
Subversion encountered a serious problem.
Please take the time to report this on the Subversion mailing list
with as much information as possible about what
you were trying to do.
But please first search the mailing list archives for the error message
to avoid reporting the same problem repeatedly.
You can find the mailing list archives at
http://subversion.apache.org/mailing-lists.html

Subversion reported the following
(you can copy the content of this dialog
to the clipboard using Ctrl-C):

In file
'D:\Development\SVN\Releases\TortoiseSVN-1.8.7\ext\subversion\subversion\libsvn_wc\diff_editor.c'
line 1623: internal malfunction
---
OK




svnsync: E160016: Path ... not present

2015-04-24 Thread Andrew Reedick
Anyone familiar with this svnsync bug/issue?  I didn't see anything substantive 
via google or in the svn issue tracker.
C:\>svnsync sync svn://localhost/devel_mirror
Transmitting file data ..
svnsync: E160016: Path 
'DigitalDelivery/DigitalSecure/ddp/aps/shared/apss-ddp-ejb/branches/apps-ddp-ejb-jboss-upgrade'
 not present


I have a master server (svn 1.8.3) pushing to a mirror (svn 1.8.11) and to a 
2nd mirror on my localhost (svn 1.8.10), both of which return the same E160016 
error when running svnsync sync.  To make things really interesting, the log 
entry on both mirrors for the missing directory is a tad off:

Master:
$ svn log -v -r 305908 http://my.svn.server/svn/devel

r305908 | jdoe | 2015-03-24 12:04:06 -0400 (Tue, 24 Mar 2015) | 1 line
Changed paths:
   A 
/DigitalDelivery/DigitalSecure/ddp/aps/shared/apss-ddp-ejb/branches/apps-ddp-ejb-jboss-upgrade




Mirror:
$ svn log -v -r 305908 
file:svn/csvn/data/repositories/devel_mirror.bad

r305908 | (no author) | (no date) | 1 line




Mirror Local:
C:\>svn log -v -r 305908 svn://localhost/devel_mirror

r305908 | (no author) | (no date) | 1 line




The dir doesn't exist on the mirrors, e.g.
C:\>svn ls 
svn://localhost/devel_mirror/DigitalDelivery/DigitalSecure/ddp/aps/shared/apss-ddp-ejb/branches/apps-ddp-ejb-jboss-upgrade
svn: warning: W160013: URL 
'svn://localhost/devel_mirror/DigitalDelivery/DigitalSecure/ddp/aps/shared/apss-ddp-ejb/branc
hes/apps-ddp-ejb-jboss-upgrade' non-existent in revision 309012
svn: E29: Could not list all targets because some targets don't 
exist
Thus, the sync fails when it tries to push a later revision that contains 
modified files under the "not present" directory.


So how does svnsync not correctly push a revision to two mirrors on two 
different computers?




RE: svnsync: E160016: Path ... not present

2015-04-24 Thread Andrew Reedick
> -Original Message-
> From: Andrew Reedick [mailto:jreed...@incomm.com] 
> Sent: Friday, April 24, 2015 1:26 PM
> To: users@subversion.apache.org
> Subject: svnsync: E160016: Path ... not present
> 
> Anyone familiar with this svnsync bug/issue?  I didn't see anything 
> substantive via google or in the svn issue tracker.
>   C:\>svnsync sync svn://localhost/devel_mirror
>   Transmitting file data ..
>   svnsync: E160016: Path 'DigitalDelivery/DigitalSecure/ddp/aps/
> shared/apss-ddp-ejb/branches/apps-ddp-ejb-jboss-upgrade' not present


Never mind.  It looks like the empty revisions were due to the sync user not 
initially having read access to that particular part of the tree.  So svnsync 
synchronized empty placeholder revisions.