Hi Stefan,
Thanks for the reply.
On 19/10/2009, at 20:29 , Stefan Sperling wrote:
> 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
>
It took me a few times of reading this to actually understand what you
meant.
But I do get it. - Thanks.
So now the error message makes perfect sense.
>> 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.
Yup got it now - thanks!
>
>> [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 ^/ .
>
I don't want to be argumentative or dismissive of your advice either -
But I have ALWAYS used the working copy for performing merges.
I simply don't do anything at the repository directly.
I did manage to do the merge by separating the three paths into three
individual reverse merge commands and that successfully worked;
svn merge -c -9593 trunk/nz/mp/patient/search.cfm
svn merge -c -9593 trunk/nz/mp/patient/searchResults.cfm
svn merge -c -9593 trunk/nz/mp/patient/showInpatient.cfm
Is there a difference between using a directory as the argument to
merge as opposed to file?
Just thinking about it now, I can't actually recall ever trying to do
a reverse merge on a directory's state - does this cause the a change
n the requirement to have to use a URL?
None the less - thanks for your help Stefan, I've certainly
consolidated the difference between the BASE revision of a file and
the entire working copy.
Gavin.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2409184
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-20 03:22:24 CEST