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

Re: Bug in rename / merge - producing unmergeable revisions [Virus checked]

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-07-25 15:14:57 CEST

On 7/25/06, gernot.eger@t-mobile.at <gernot.eger@t-mobile.at> wrote:
> Hi everybody,
> I think I encountered a bug with rename that resuls in revisions that
> can't be merged, or more precisely,
> can be merged but the result can't be committed.
> It goes like
> 1. create trunk/A.txt
> 2. create a branch from trunk to b1
> 3. rename A.txt to something else
> 4. create a new A.txt, with different content
> 5. commit it
> When merging the results from this operation back to trunk, and trying to
> commit it, this error message occurred:
> Replacing trunk\A.txt
> svn: Commit failed (details follow):
> svn: Out of date: '/trunk/A.txt' in transaction '3-1'

This issue is fixed in 1.4.0: until then, replacements-with-history are broken.



PS: The workaround is to merge until the delete, commit that and then
merge from the add...

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 25 15:15:30 2006

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

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