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

Cannot reverse merge @head?

From: Gavin Baumanis <gavinb_at_thespidernet.com>
Date: Mon, 19 Oct 2009 11:31:22 +1100

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

So I ran the update and tried again;

[beau_at_MacBook:~/svn/palcare] $svn update
At revision 9593.
[beau_at_MacBook:~/svn/palcare] $svn merge -c -9593 trunk/nz/mp/patient/
[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!

Thanks
Gavin.

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

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

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