I wrote: > Well, turns out Mercurial isn't as good as was promised. > > After I created the vim73 branch, I made a change in the default branch, > to fix the Japanese menus. I wanted to rebase the vim73 branch to pick > up this change, but what happened instead is that the vim73 changes got > to the default branch. Now I can't manage to make "hg status" show the > Japanes file changes show up in the vim73 branch. > > Can someone tell me how to remove the vim73 changes from the default > branch and get the vim73 branch to pick up the changes to the Japanese > menus? > > Please reply to me directly if you know how to do this.
I managed to fix it by discarding my local repository, cloning a new one, "hg revert" and pushing that. So the top of the "default" branch is now OK again, just the history is a bit messed up. Instead of "hg rebase" I now used "hg merge" to pick up the change from the default branch in the vim73 branch. Not as nice, but works. -- The future isn't what it used to be. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php
