You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Pedro Beck Gomes da Costa <pb...@ciberbit.pt> on 2003/11/04 13:27:54 UTC
[Fwd: Merge BUG in Windows]
Hi,
I'm using SubVersion 0.32.1 in Windows XP.
When trying to merge a branch with the main trunk I got a message saying:
End of file reached
Cannot read from EncomendasLojas.3.tmp.tmp
and the merge fails...
I the begining I thought it was because I was trying to merge 300 files
and that was too much, but after I found that It was just one file that
was causing the problems.
The file is a Delphi form definition file (text) and is similar (and
even smaller) than many others that SubVersion has no problem in
merging. CVS do it without any problem, so the problem is not the file.
I send the file in attachement. If I create a new Repository with only
this file and checkout it and then create a branch and then change the
file in the branche, when i try to merge it with the trunk i get the error.
If I do the same in my Slackware 9.0 box everything works.
Can someone tell me something about this?
Thanks in Advance
Pedro Costa
Re: [Fwd: Merge BUG in Windows]
Posted by Pedro Beck Gomes da Costa <pb...@ciberbit.pt>.
uppsss..... I really apologize but I made a mistake again….
Finally, the real message that I get is only:
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.
There’s no “C EncomendasLojas.dfm” line...
I’m really sorry for all this mess, but in my test repository I had more
files than the one
that is causing problems and I wanted to isolate the information…
Sorry again,
Pedro Costa
kfogel@collab.net wrote:
>Pedro Beck Gomes da Costa <pb...@ciberbit.pt> writes:
>
>
>>I send the file in attachement. If I create a new Repository with only
>>this file and checkout it and then create a branch and then change the
>>file in the branche, when i try to merge it with the trunk i get the
>>error.
>>
>>
>
>What's the exact command line you use for the merge, and what is all
>the output?
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Merge BUG in Windows]
Posted by Pedro Beck Gomes da Costa <pb...@ciberbit.pt>.
Hi, Thanks for your contact.
As I said in the original message, If I create a test repository with
this structure:
SVN_REPOS
Projecto
trunk
EncomendasLojas.dfm
tags
branches
A
EncomendasLojas.dfm
Changing the file on branch A and issuing this command to merge with
trunk (inside the trunk working copy):
svn merge -r 3:HEAD file:///SVN_REPOS/Projecto/branches/A
gives me:
C Novo Documento de texto.txt
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.
The merge fails and I get the following files on the dir (workin copy of
the trunk):
08-09-2003 14:08 134.221 EncomendasLojas.dfm
11-11-2003 11:18 0 EncomendasLojas.dfm.2.tmp
11-11-2003 11:18 134.221 EncomendasLojas.dfm.tmp
11-11-2003 11:18 134.273 EncomendasLojas.dfm.tmp.2.tmp
11-11-2003 11:18 0 EncomendasLojas.dfm.tmp.tmp
I'm using Windows XP Professional with SubVersion 0.32.1. I tried the
same with TortoiseSVN 0.21 (that uses the same SVN version) with same
results.
The exact same thing works fine when I try it on my Linux box (Slackware
9.0 with svn0.32.1 compiled from sources) and on my FreeBSD Box (FreeBSD
4.8 with svn0.32.1 compiled from the svn port), so it must be some
problem with the windows version.
If you need something more just contact me!
Thanks again,
Pedro Costa
kfogel@collab.net wrote:
>Pedro Beck Gomes da Costa <pb...@ciberbit.pt> writes:
>
>
>>I send the file in attachement. If I create a new Repository with only
>>this file and checkout it and then create a branch and then change the
>>file in the branche, when i try to merge it with the trunk i get the
>>error.
>>
>>
>
>What's the exact command line you use for the merge, and what is all
>the output?
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Merge BUG in Windows]
Posted by Pedro Beck Gomes da Costa <pb...@ciberbit.pt>.
Just to say that SubVersion 0.33.1 solved this problem (now I can merge
this file).
thks
Pedro Costa
kfogel@collab.net wrote:
>Pedro Beck Gomes da Costa <pb...@ciberbit.pt> writes:
>
>
>>I send the file in attachement. If I create a new Repository with only
>>this file and checkout it and then create a branch and then change the
>>file in the branche, when i try to merge it with the trunk i get the
>>error.
>>
>>
>
>What's the exact command line you use for the merge, and what is all
>the output?
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Merge BUG in Windows]
Posted by Pedro Beck Gomes da Costa <pb...@ciberbit.pt>.
Sorry! Just a little correction...
In my last email, when its said:
C Novo Documento de texto.txt
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.
it should be:
C EncomendasLojas.dfm
svn: End of file found
svn: Failed to read file 'EncomendasLojas.dfm.tmp'.
Sorry... I wrote the name of a file from the project I was working in that moment :)
Pedro Costa
kfogel@collab.net wrote:
>Pedro Beck Gomes da Costa <pb...@ciberbit.pt> writes:
>
>
>>I send the file in attachement. If I create a new Repository with only
>>this file and checkout it and then create a branch and then change the
>>file in the branche, when i try to merge it with the trunk i get the
>>error.
>>
>>
>
>What's the exact command line you use for the merge, and what is all
>the output?
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [Fwd: Merge BUG in Windows]
Posted by kf...@collab.net.
Pedro Beck Gomes da Costa <pb...@ciberbit.pt> writes:
> I send the file in attachement. If I create a new Repository with only
> this file and checkout it and then create a branch and then change the
> file in the branche, when i try to merge it with the trunk i get the
> error.
What's the exact command line you use for the merge, and what is all
the output?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org