I don't have a fix - we've just been doing merges with
--ignore-ancestry (on our dead-end release branch) and deferring other
merges for the time being. It's filed as Issue 3312
http://subversion.tigris.org/issues/show_bug.cgi?id=3312
If you caused it with something simpler than the use of --depth=empty
described in the Issue, that would be interesting to know, as far as
testing the fix goes...
On Wed, Nov 12, 2008 at 11:19 AM, Joe Bell <joe.bell_at_prodeasystems.com> wrote:
> I was reading through previous posts on this issue and didn't see anything
> that indicated how to "fix it" – I'm using a 1.5.0 (r31699) client –
>
>
>
> I did a straightforward copy of my trunk to a development branch and then
> when trying to use svn merge to rebase my development branch to the trunk I
> get met with the "maps to an empty revision range" issue.
>
>
>
> Looking at the mergeinfo:
>
>
>
> [root_at_scm37 upgrade]# svn propget svn:mergeinfo
>
> /project/branches/dev_joe.bell_1:32815-33280*
>
>
>
> Is it safe to nuke the mergeinfo information listed if I know that branch is
> no longer going to be used?
>
>
>
> Joe
>
> Joseph Bell
>
> This message is confidential to Prodea Systems, Inc unless otherwise
> indicated
> or apparent from its nature. This message is directed to the intended
> recipient
> only, who may be readily determined by the sender of this message and its
> contents. If the reader of this message is not the intended recipient, or an
> employee or agent responsible for delivering this message to the intended
> recipient:(a)any dissemination or copying of this message is strictly
> prohibited; and(b)immediately notify the sender by return message and
> destroy
> any copies of this message in any form(electronic, paper or otherwise) that
> you
> have.The delivery of this message and its information is neither intended to
> be
> nor constitutes a disclosure or waiver of any trade secrets, intellectual
> property, attorney work product, or attorney-client communications. The
> authority of the individual sending this message to legally bind Prodea
> Systems
> is neither apparent nor implied,and must be independently verified.
--
_Mark_ <eichin_at_thok.org> <eichin_at_gmail.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-12 20:15:28 CET