Re: Trunk to branch merge error on renamed component
From: Murli Varadachari <mvaradachari_at_facebook.com>
Date: Fri, 6 Mar 2009 09:01:20 -0800
On 3/6/09 7:29 AM, "Stefan Sperling" <stsp_at_elego.de> wrote:
On Thu, Mar 05, 2009 at 06:45:52PM -0800, Murli Varadachari wrote:
>>>With which version of Subversion did this error happen?
I personally ran this with svn 1.5.6. As I mentioned earlier this took me past the merge but crashed on commit.
A developer here used 1.6.0-rc2 to test the same on a different host. [ I asked him to do so that would eliminate any environmental / host specific issues]. He got the
> As far as I can see the branch WC is fully up-to date. Problem still
>>>Did you really try to run 'svn update' after you got the out-of-date error?
Yes - I ran svn update maybe a dozen times - I get "At revision 149313." each time --- .
Just before sending this reply I checked out a fresh copy, ran through the same merge sequence and tried to commit. [ with svn 1.5.6 ]. Once again I get this same error message.
It does appear to be a bug.
Right now I am stuck!
>>>Stefan
murli
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
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.