You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Thorsten Gecks <Th...@uni-bayreuth.de> on 2006/10/05 14:51:20 UTC
Merge problem
I am using svn version 1.3.0 (r17949) here and I have the following
phenomenon, that I don't understand. Is it a bug or a feature:
1) Made a branch of an existing tree(trunk) with svn copy
2) in trunk: deleted file TestFile and committed
3) in trunk: created link with the same name, added and committed
4) tried to merge both modifications into branch with a single merge
command, succeded with
D TestFile
A TestFile
as output.
5) Then I tried to commit these changes and got the following
error message:
Replacing TestFile
svn: Commit failed (details follow):
svn: Veraltet: '/tmp/test/TestFile' in Transaktion '792-1'
Sorry, that the last message is german, but setting the LANG variable
to en_GB didn't help, maybe this translation helps:
(svn: Too old: '/tmp/test/TestFile' in transaction '792-1')
Bye
Thorsten
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge problem
Posted by Erik Huelsmann <eh...@gmail.com>.
On 10/5/06, Reedick, Andrew <An...@bellsouth.com> wrote:
[ snip scenario for creating replace with history working copy item ]
> >
>
> That looks like a bug that was supposedly fixed in 1.4.0. If you delete
> and add a file, the commit will fail. I've occassionally had this
> problem when doing merges using 1.3.x.
Yes, it is. I'd like to point out that the only way to fsck your
working copy this way (in versions older than 1.4) is by using merge:
normal working copy commands won't allow one to create a situation
like this.
The problem here is that a versioned item is replaced with another
item which already has history in the repository (=
replace-with-history). Normal replacements (new item is added to
version control; no history) were never a problem.
> The commit still fails if you revert the file. The workaround I used
> was to commit every file but the R's.
> 1. run 'svn status' and save the output to a file (status.log).
> 2. Save status.log somewhere safe.
> 3. Copy status.log to a new name (filelist.txt). (Keep status.log for
> step 6.)
> 4. Delete any lines in filelist.txt with a status of 'R' (or '?').
> Remove the status codes so you have just filenames remaining.
> 5. svn commit -m "..." --targets filelist.txt
> 6. Create a new workspace and 'merge' the 'R' files manually (don't use
> 'svn merge'). Refer to status.log for the 'R' files.
>
> Or use a 1.4.0 client to do the merge.
Absolutely the best way to resolve the issue, now and in the future
(use 1.4), but beware of the working copy upgrading that happens when
you access the old working copy with the new client. Also see the
release notes.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Merge problem
Posted by "Reedick, Andrew" <An...@BellSouth.com>.
> -----Original Message-----
> From: Thorsten Gecks [mailto:Thorsten.Gecks@uni-bayreuth.de]
> Sent: Thursday, October 05, 2006 10:51 AM
> To: users@subversion.tigris.org
> Subject: Merge problem
>
> I am using svn version 1.3.0 (r17949) here and I have the following
> phenomenon, that I don't understand. Is it a bug or a feature:
>
> 1) Made a branch of an existing tree(trunk) with svn copy
> 2) in trunk: deleted file TestFile and committed
> 3) in trunk: created link with the same name, added and committed
> 4) tried to merge both modifications into branch with a single merge
> command, succeded with
>
> D TestFile
> A TestFile
>
> as output.
>
> 5) Then I tried to commit these changes and got the following
> error message:
>
> Replacing TestFile
> svn: Commit failed (details follow):
> svn: Veraltet: '/tmp/test/TestFile' in Transaktion '792-1'
>
> Sorry, that the last message is german, but setting the
> LANG variable
> to en_GB didn't help, maybe this translation helps:
> (svn: Too old: '/tmp/test/TestFile' in transaction '792-1')
>
>
That looks like a bug that was supposedly fixed in 1.4.0. If you delete
and add a file, the commit will fail. I've occassionally had this
problem when doing merges using 1.3.x.
The commit still fails if you revert the file. The workaround I used
was to commit every file but the R's.
1. run 'svn status' and save the output to a file (status.log).
2. Save status.log somewhere safe.
3. Copy status.log to a new name (filelist.txt). (Keep status.log for
step 6.)
4. Delete any lines in filelist.txt with a status of 'R' (or '?').
Remove the status codes so you have just filenames remaining.
5. svn commit -m "..." --targets filelist.txt
6. Create a new workspace and 'merge' the 'R' files manually (don't use
'svn merge'). Refer to status.log for the 'R' files.
Or use a 1.4.0 client to do the merge.
*****
The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA622
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org