On 17 August 2010 20:42, Jjgod Jiang wrote: > On Tue, Aug 17, 2010 at 8:38 PM, björn wrote: >> Hi, >> >> This is most likely a complete newbie problem, but ever since the >> branch renaming business I get warnings when I pull from the Mercurial >> repo. I did a fresh clone this morning thinking the problems would go >> away, but they did not. Here's what happens: >> >> $ hg fetch >> pulling from https://vim.googlecode.com/hg/ >> searching for changes >> adding changesets >> adding manifests >> adding file changes >> added 1 changesets with 2 changes to 2 files >> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved >> updating to 2191:b619655b31db >> 476 files updated, 0 files merged, 38 files removed, 0 files unresolved >> merging with 2576:2a8bf2ba504f >> local changed README_lang.txt which remote deleted >> elete? danged version or (d) >> >> Note the weird prompt. Well, I hit "d" and get lots of merge >> conflicts and finally >> >> 320 files updated, 180 files merged, 6 files removed, 8 files unresolved >> use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon >> Spectre:vim winckler$ hg update -C >> 508 files updated, 0 files merged, 0 files removed, 0 files unresolved >> >> Can anybody tell me what's the matter? I have not switched branches >> or anything, so I'd assume hg would just pull the changesets and "fast >> forward" (and here you see my problem, I have a basic of understanding >> of Git but am completely bewildered by Mercurial). >> >> I used to be able to "hg fetch" ("fetch" is an extension, btw) with no >> problems. > > It's fine here (though hg-fast-export had some troubles interpreting the > branch rename thing). How about a simple "hg pull", still get the same > problem?
The problem was that there are now two heads like Tony mentioned in another thread. The solution (in case somebody else has been following my instructions on how to set up a Git repo) is to use "hg pull" and to not merge. In fact, I now don't check out a working copy at all (I've updated the instructions at [1] to reflect this change). Björn [1] http://github.com/b4winckler/vim/wiki -- 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
