Re: checkout ends with error

[Philip Martin]

Chris Carman  writes:

> When I run the following checkout command, the directories are created as
> expected, but the checkout ends with an error:
>
>  svn co https://github.com/NUKnightLab/TimelineJS --depth immediates
>  ATimelineJS/branches
>  ATimelineJS/tags
>  ATimelineJS/trunk
>  svn: E24: Could not convert '' into a number

github.com is sending the committed-rev entry property without a
revision:

  \n

This is a problem with github's svn proxy, similar to the problem
reported here:

http://mail-archives.apache.org/mod_mbox/subversion-dev/201202.mbox/%3CCAPpU=V2ehx0hSyQMt2y=apaa9_q16efdxs6ki6cerwyketx...@mail.gmail.com%3E

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*

SVN crash

[Walke, Martin (Selex ES, UK)]

Hi,

Please find attached the dump and log files output when the following command 
had been used in a Windows environment accessing a Subversion Edge server 
repository:

svn export https://avtmsvn-selex-es.com/svn/Complete/NATS_Use_Case_Work 
NATS_Use_Case_Work

Kind regards
Martin
___
Martin Walke
Principal Engineer
martin.wa...@selex-es.com
SELEX ES, A Finmeccanica Company
1st Avenue,
Millbrook Industrial Estate,
Southampton,
Hampshire
SO15 0LG
+44 (0)2380 706651
www.selex-es.com
Notice of Confidentiality
This transmission is intended for the named addressee(s) only. It contains 
information which may be confidential and which may also be privileged. Unless 
you are a named addressee (or authorised to receive it for the addressee) you 
may not copy or use it, or disclose it to anyone else. If you have received 
this transmission in error please notify me.

Selex ES Ltd, acting through Selex ES Infrared Ltd whose registered office is 
located at Sigma House, Christopher Martin Road, Basildon, Essex SS14 3EL, 
having a place of business at First Avenue, Millbrook Industrial Estate, 
Southampton, Hampshire, SO15 0LG, England

This email and any attachments are confidential to the intended
recipient and may also be privileged. If you are not the intended
recipient please delete it from your system and notify the sender.
You should not copy it or use it for any purpose nor disclose or
distribute its contents to any other person.



svn-crash-log20140805155931.dmp
Description: svn-crash-log20140805155931.dmp


svn-crash-log20140805155931.log
Description: svn-crash-log20140805155931.log

Directory with tree conflict lies about merge result

[Benjamin Fritz]

I accidentally created a "host" directory both on a feature branch,
and on trunk. On trunk, this directory contains a "lib" subdirectory
containing a project to build a Windows version of the library I'm
developing. On the feature branch, this directory instead contains a
"test" directory containing a unit test of the feature.

I'm trying to merge TO my feature branch, the trunk revision that
added the Windows project of the library, so that the final result is
my feature branch has a "host" directory with two subdirectories:
"test" and "lib".

The result of a merge command *looks* like this is happening:

C:\Project_Files\FEATURE_WC>svn merge -c 6891 http://example.com/SVN/lib/trunk
--- Merging r6891 into '.':
 U   externals
Alib\win32
Alib\win32\lib.lib
Alib\win32\lib.d.lib
   C host
   A host\lib\lib.sln
   A host\lib\proj\lib.vcxproj
   A host\lib\proj\lib.vcxproj.filters
   A host\lib\proj\lib.vcxproj.user
   A host\lib\proj
   A host\lib
--- Recording mergeinfo for merge of r6891 into '.':
 U   .
Conflict discovered when trying to add 'host'.
An object of the same name already exists.
Select: (mf) my version, (tf) their version, (p) postpone,
(q) quit resolution, (h) help:

No matter what answer I give to the question ("mf", "tf", "p", or "q")
when I check the "host" directory, no "lib" directory was created and
neither it nor any of the added files under "lib" actually got added
to my working copy.

Why does SVN report adding those files as part of the merge, if the
files were not actually added?

How can I get SVN to actually add these files? Do I need to manually
"svn copy" http://example.com/SVN/lib/trunk/host/lib into my working
copy?

Re: Directory with tree conflict lies about merge result

[Andreas Stieger]

Hello,

I recommend the following:
In a clean working copy of the feature branch...
svn mv host host_branch
Then perform the merge, now without tree conflict.
svn mv host_branch/test host/
svn rm host_branch

Andreas 

> On 6 Aug 2014, at 18:04, Benjamin Fritz  wrote:
> 
> I accidentally created a "host" directory both on a feature branch,
> and on trunk. On trunk, this directory contains a "lib" subdirectory
> containing a project to build a Windows version of the library I'm
> developing. On the feature branch, this directory instead contains a
> "test" directory containing a unit test of the feature.
> 
> I'm trying to merge TO my feature branch, the trunk revision that
> added the Windows project of the library, so that the final result is
> my feature branch has a "host" directory with two subdirectories:
> "test" and "lib".
> 
> The result of a merge command *looks* like this is happening:
> 
> C:\Project_Files\FEATURE_WC>svn merge -c 6891 http://example.com/SVN/lib/trunk
> --- Merging r6891 into '.':
> U   externals
> Alib\win32
> Alib\win32\lib.lib
> Alib\win32\lib.d.lib
>   C host
>   A host\lib\lib.sln
>   A host\lib\proj\lib.vcxproj
>   A host\lib\proj\lib.vcxproj.filters
>   A host\lib\proj\lib.vcxproj.user
>   A host\lib\proj
>   A host\lib
> --- Recording mergeinfo for merge of r6891 into '.':
> U   .
> Conflict discovered when trying to add 'host'.
> An object of the same name already exists.
> Select: (mf) my version, (tf) their version, (p) postpone,
>(q) quit resolution, (h) help:
> 
> No matter what answer I give to the question ("mf", "tf", "p", or "q")
> when I check the "host" directory, no "lib" directory was created and
> neither it nor any of the added files under "lib" actually got added
> to my working copy.
> 
> Why does SVN report adding those files as part of the merge, if the
> files were not actually added?
> 
> How can I get SVN to actually add these files? Do I need to manually
> "svn copy" http://example.com/SVN/lib/trunk/host/lib into my working
> copy?

Re: Directory with tree conflict lies about merge result

[Benjamin Fritz]

On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger  wrote:
> Hello,
>
> I recommend the following:
> In a clean working copy of the feature branch...
> svn mv host host_branch
> Then perform the merge, now without tree conflict.
> svn mv host_branch/test host/
> svn rm host_branch
>

Thanks! That got me around my immediate problem.

But why does "svn merge" output misleading status, saying that it
added files and folders that never actually get added to the working
copy?

Re: Directory with tree conflict lies about merge result

[Stefan Sperling]

On Wed, Aug 06, 2014 at 12:21:39PM -0500, Benjamin Fritz wrote:
> On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger  
> wrote:
> > Hello,
> >
> > I recommend the following:
> > In a clean working copy of the feature branch...
> > svn mv host host_branch
> > Then perform the merge, now without tree conflict.
> > svn mv host_branch/test host/
> > svn rm host_branch
> >
> 
> Thanks! That got me around my immediate problem.
> 
> But why does "svn merge" output misleading status, saying that it
> added files and folders that never actually get added to the working
> copy?

The server keeps sending adds for the paths.
It has no idea the client cannot use them.

Note how the As you're asking about appear in the tree-conflict column,
not in the first column as normal adds do. They allow you to see what
the server wants to add beneath its version of 'host'.

C:\Project_Files\FEATURE_WC>svn merge -c 6891 http://example.com/SVN/lib/trunk
--- Merging r6891 into '.':
 U   externals
Alib\win32
Alib\win32\lib.lib
Alib\win32\lib.d.lib
   C host
   A host\lib\lib.sln
   A host\lib\proj\lib.vcxproj
   A host\lib\proj\lib.vcxproj.filters
   A host\lib\proj\lib.vcxproj.user
   A host\lib\proj
   A host\lib

Re: Directory with tree conflict lies about merge result

[Benjamin Fritz]

On Wed, Aug 6, 2014 at 1:00 PM, Stefan Sperling  wrote:
> The server keeps sending adds for the paths.
> It has no idea the client cannot use them.
>
> Note how the As you're asking about appear in the tree-conflict column,
> not in the first column as normal adds do. They allow you to see what
> the server wants to add beneath its version of 'host'.

I get it now! Thanks for the clarification.