Re: re[Monotone-devel] name target conflicts: nodes 7371, 676 both wanted parent 0

[address@hidden 28]

Richard Laager wrote:
> 
> On Thu, 2007-10-25 at 01:31 -0700, address@hidden 28 wrote:
>> I'm trying to merge two Pidgin revisions in my local monotone database.
>> The
>> reason being a patch works up to one revision, and from that on applies
>> fine
>> but stops working.
>> Here are my steps....hope someone can help me understand what's the
>> matter.
>> I add the new branch:
>> 
>> mtn -d pidgin.mtn --branch=im.pidgin.cpw.khc.msnp14.ticket1187 setup 
> 
> In the ticket, I told you to checkout a copy from the parent revision
> that, according to you, last worked:
> 
> mtn -d $DATABASE checkout -r dd6bb3a7d349ba0a9fe8cea9698aea8227a95658
> 
> Then you were to apply the patch and then run:
> 
> mtn commit -b im.pidgin.cpw.khc.msnp14.ticket1187
> 
> 
> Unless you have other changes to your database, throw it away and start
> over, following these instructions.
> 
> Richard
> 
>  
> _______________________________________________
> Monotone-devel mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/monotone-devel
> 
> 

Right-oh, Richard....I'll try following step to step your instructions....I
keep forgetting Monotone is always working locally, at least until I do a
mtn push....I'll post again here, if I have any problems, ok?
Ah, by the way, sorry for being such a nuisance....I try my best not to
pester you developers too much....Thank you for your kind and prompt
support, as always!
-- 
View this message in context: 
http://www.nabble.com/rename-target-conflicts%3A-nodes-7371%2C-676-both-wanted-parent-0-tf4689311.html#a13421094
Sent from the monotone-devel mailing list archive at Nabble.com.