List:Internals« Previous MessageNext Message »
From:Michael Widenius Date:March 25 2002 10:34pm
Subject:Re: PENDING directory in source tree
View as plain text  
Hi!

>>>>> "Sasha" == Sasha Pachev <sasha@stripped> writes:

Sasha> On Friday 22 March 2002 06:59 am, Ken Menzel wrote:
>> Thanks Sasha, ?Should I do this often? ?Am I not merging correctly?
>> I do this now:
>> 
>> cd mysql-4.0
>> bk pull
>> bk -r edit
>> 
>> should I add bk abort right after the bk -r edit?

Sasha> No, you are doing everything right. It seems, however, that for some reason 
Sasha> your pull did not finish leaving some temporary files in the RESYNC 
Sasha> directory. If that ever happens, bk abort followed by the pull will solve the 
Sasha> problem.

The full procedure is:

cd mysql-4.0
bk citool
bk pull
bk resolve (if you get an message about RESYNC)
bk -r edit

Regards,
Monty

-- 
For technical support contracts, goto https://order.mysql.com/
   __  ___     ___ ____  __
  /  |/  /_ __/ __/ __ \/ /    Mr. Michael Widenius <monty@stripped>
 / /|_/ / // /\ \/ /_/ / /__   MySQL AB, CTO
/_/  /_/\_, /___/\___\_\___/   Helsinki, Finland
       <___/   www.mysql.com
Thread
PENDING directory in source treeKen Menzel21 Mar
  • Re: PENDING directory in source treeSasha Pachev22 Mar
  • Re: PENDING directory in source treeKen Menzel22 Mar
    • Re: PENDING directory in source treeSasha Pachev23 Mar
      • Re: PENDING directory in source treeMichael Widenius26 Mar
  • Re: PENDING directory in source treeColin Faber26 Mar