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

Re: Cannot reverse merge @head?

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 19 Oct 2009 11:29:37 +0200

On Mon, Oct 19, 2009 at 11:31:22AM +1100, Gavin Baumanis wrote:
> Hi Everyone;
>
> Just thought I would check if I am doing something silly - or If I
> have stumbled onto something.
> (Though I am sure I have tried this previously and not had a problem.)
>
> Anyway,
>
> I committed a change - tested it and found that it dod not work on
> the staging server.
> I tried to reverse the merge the change and got a message error that I
> had never seen before.
> here are the stpes;
>
> [beau_at_MacBook:~/svn/palcare] $svn status
> M trunk/nz/mp/patient/search.cfm
> M trunk/nz/mp/patient/showinpatient.cfm
> M trunk/nz/mp/patient/searchResults.cfm
> [beau_at_MacBook:~/svn/palcare] $svn commit -m '#11816 - Copied from
> Nelson for updates to allow NHI NUMBER to be used on the search screen'
> Sending trunk/nz/mp/patient/search.cfm
> Sending trunk/nz/mp/patient/searchResults.cfm
> Sending trunk/nz/mp/patient/showinpatient.cfm
> Transmitting file data ...
> Committed revision 9593.
>
>
> [beau_at_MacBook:~/svn/palcare] $svn merge -c -9593 trunk/nz/mp/patient/
> svn: Cannot reverse-merge a range from a path's own future history;
> try updating first

The nz/mp/patient's BASE revision has not been changed by your commit.
The only nodes which had their BASE bumped to r9593 are:

        trunk/nz/mp/patient/search.cfm
        trunk/nz/mp/patient/searchResults.cfm
        trunk/nz/mp/patient/showinpatient.cfm

> So I ran the update and tried again;
>
> [beau_at_MacBook:~/svn/palcare] $svn update
> At revision 9593.

Now BASE has been bumped to r9593 everywhere.

> [beau_at_MacBook:~/svn/palcare] $svn merge -c -9593 trunk/nz/mp/patient/

You need a URL in there, but you have a working copy path.
Try: svn merge -c -9593 ^/ .

> [beau_at_MacBook:~/svn/palcare] $svn status
> [beau_at_MacBook:~/svn/palcare] $
>
> The update seems to have gotten rid of the error message - but I don't
> even understand the error message.
> But none the less, it doesn't seem to have reverted the last commit,
> anyway.
>
> if anyone has any insights - I'd be most appreciative!

See above, I hope it helped :)

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2408888

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-19 11:30:32 CEST

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