Hi Caolan, On Thu, 2008-11-06 at 15:22 +0000, Caolán McNamara wrote: > On Thu, 2008-11-06 at 10:13 -0500, Kohei Yoshida wrote: > > On Thu, 2008-11-06 at 15:57 +0100, Rüdiger Timm wrote: > > > Your 'cws rebase -m <whatever> should have written a file named > > > REBASE.CONFIG_DONT_DELETE to that directory. Do you see such a file at > > > /home/kyoshida/ooo/koheidatapilot02 ? > > > > No, I don't see such file in my root directory. I do have REBASE.LOG > > though. > > Perhaps > cd /home/kyoshida/ooo/koheidatapilot02 > source Linux*Env.sh > cd ../ > cws rebase -m m35 koheidatapilot02 > cws rebase -C koheidatapilot02 > > would create the new REBASE.CONFIG_DONT_DELETE file and so on.
Yup, you're right on! Well, actually using 'koheidatapilot02' as the workspace argument didn't work; however, getting the hint from this, I re-checked out the cws and re-ran 'cws rebase -m m35' at the top level directory, with the current directory '.' as the workspace argument. That created REBASE.CONFIG_DONT_DELETE file at the top level. After that, resolving conflicts and running 'cws rebase -C .' (also with '.' as the argument) sent the code change back to the repository. Thanks a lot. Kohei P.S. Hmm... the EIS entry is still not updated. It still says the current milestone is m32.... Perhaps this is due to Issue 95921 ? --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
