[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Unrecoverable conflicts during merge after renaming

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-08-02 16:29:21 CEST

On 8/2/06, Jens Seidel <jensseidel@users.sf.net> wrote:
> Hi,
> I recently performed a huge merge but got a few errors during it.
> So I copied for example before the merge a copy of the wanted files into
> my working copy. Adding these files via the merge process fails now of course.
> I solved this by renaming of my local files. Later I verified that both
> files (my local one and the one from merge) are equal (but the merged file
> contains also the history) and removed my old one.
> So far so good.
> Nevertheless I got also errors which I could not resolve!
> One example (I performed these steps after the failure which is now hard to
> reproduce):
> $ svn up
> svn: Arbeitskopie Pfad 'vda-variable.cc' existiert nicht im Projektarchiv
> (working copy path 'vda-variable.cc' does not exist in project archive)
> (Sorry I don't know why this is German. My locale for this report is "POSIX"
> (LANG is not set) and even "LANG=C svn up" produces the same!)
> Removing this conflicting file from my working copy is not possible as it
> does not exist. A "svn del" on this file does not help either.
> I found only one workaround for these conflicts: I renamed the entire
> directory which contains this file and continued merging! Otherwise following
> directories would not be merged since svn stops on each error.
> $ svn status
> ! .
> $ svn status --verbose
> + - 628 jens vda-variable.cc
> The problem is probably related to the history of this file in my branch, from
> which I tried to merge it (from 563 up to 689):
> I renamed vda-variable.h into vda-variable.cc in r231 and also one of the
> toplevel directories was renamed in r289 and r588.
> Also not very useful:
> $ svn log vda-variable.cc
> svn: Datei nicht gefunden: Revision 0, Pfad '/branches/src/vda-variable.cc'
> (file not found: revision 0, path '/branches/src/vda-variable.cc)
> I use svn version 1.3.0 (r17949).
> Yes, I know that Subversion does not yet support true renaming but
> unrecoverable errors should not happen. Svn should at least continue with
> other files instead of stopping during the first error (merge is not atomic,
> right?).
> Is there any way that svn just ignores the conflicting file without need to
> remove the full directory containing the file?
> Please CC: me.

You really need to include the exact steps you took, ideally a literal
transcript of the commands you ran, otherwise it's pretty much
impossible for us to reproduce the problem and suggest a solution.
The information you included in your mail has bits and pieces of
what's going on, but the steps in between those bits and pieces are


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 2 16:32:37 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.