From: <don...@is...> - 2011-04-29 17:26:32
|
hg pull -u says: pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp searching for changes adding changesets adding manifests adding file changes added 5 changesets with 12 changes to 7 files abort: crosses branches (merge branches or use --check to force update) I'm guessing someone has to fix the repository ? |
From: <don...@is...> - 2011-06-13 17:05:16
|
Nightly builds both complain (different complaints from different versions of hg) hg pull -u => pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp abort: 'http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp' does not appear to be an hg repository! => abort: requirement '<?xml version="1.0" encoding="UTF-8"?>' not supported! |
From: Sam S. <sd...@gn...> - 2011-04-29 18:49:32
|
> * Don Cohen <qba...@vf...3-vap.pbz> [2011-04-29 10:26:30 -0700]: > > hg pull -u > says: > pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp > searching for changes > adding changesets > adding manifests > adding file changes > added 5 changesets with 12 changes to 7 files > abort: crosses branches (merge branches or use --check to force update) > > I'm guessing someone has to fix the repository ? 1. yes, you need to fix your local repo. try "hg st", "hg up tip", "hg out" &c. usually "hg revert" and (if you have local commits) "hg strip" will help you. 2. this is not a clisp issue (it would have been if the repo @ sf were corrupt, but it is not). please ask the mercurial mailing list. -- Sam Steingold (http://sds.podval.org/) on CentOS release 5.6 (Final) X 11.0.60900031 http://camera.org http://pmw.org.il http://openvotingconsortium.org http://ffii.org http://honestreporting.com http://palestinefacts.org Daddy, why doesn't this magnet pick up this floppy disk? |
From: <don...@is...> - 2011-04-29 22:38:50
|
Sam Steingold writes: > > * Don Cohen <qba...@vf...3-vap.pbz> [2011-04-29 10:26:30 -0700]: > > > > hg pull -u > > says: > > pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp > > searching for changes > > adding changesets > > adding manifests > > adding file changes > > added 5 changesets with 12 changes to 7 files > > abort: crosses branches (merge branches or use --check to force update) > > > > I'm guessing someone has to fix the repository ? > > 1. yes, you need to fix your local repo. try "hg st", "hg up tip", "hg > out" &c. usually "hg revert" and (if you have local commits) "hg strip" > will help you. Can you explain what sort of change on the sf repo caused this problem? Evidently you think that hg pull -u is not necessarily enough to update my version of the source. In that case, please tell me what I ought to do instead. What does hg up tip do in comparison with hg pull -u ? > 2. this is not a clisp issue (it would have been if the repo @ sf were > corrupt, but it is not). please ask the mercurial mailing list. I imagine it's a problem with either the way hg is being used to alter the repository, or the way I'm trying to update my copy. If I sent this to the hg list they'd probably ask what I'm trying to do, and although at one level I know what I'm trying to do - update my version to be the same as the sf repo - I don't know what sort of policies are intended for updating the repo - are we trying to avoid all branching, so that all I need is a single tip? If so, the message about crossing branches suggests that some recent updates have failed to conform to that policy. |
From: Samir S. <ze...@gm...> - 2011-04-30 10:27:51
|
Hi, On Fri, Apr 29, 2011 at 10:26:30AM -0700, Don Cohen wrote: > > hg pull -u > says: > pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp > searching for changes > adding changesets > adding manifests > adding file changes > added 5 changesets with 12 changes to 7 files > abort: crosses branches (merge branches or use --check to force update) > the pull process did its job, the update (-u) failed because you probably need to do a merge before updating. multiple heads? |
From: Elliott S. <ell...@gm...> - 2011-04-30 17:44:00
|
On Sat, Apr 30, 2011 at 3:27 AM, Samir SAADA <ze...@gm...> wrote: > Hi, > > On Fri, Apr 29, 2011 at 10:26:30AM -0700, Don Cohen wrote: > > > > hg pull -u > > says: > > pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp > > searching for changes > > adding changesets > > adding manifests > > adding file changes > > added 5 changesets with 12 changes to 7 files > > abort: crosses branches (merge branches or use --check to force update) > > > > the pull process did its job, > the update (-u) failed because you probably > need to do a merge before updating. > multiple heads? I got this error once by having uncommitted changes while updating. I had to revert my changes before Mercurial would stop complaining. Just something to check. -- Elliott Slaughter "Don't worry about what anybody else is going to do. The best way to predict the future is to invent it." - Alan Kay |
From: <don...@is...> - 2011-04-30 18:22:17
|
Elliott Slaughter writes: > > > hg pull -u > > > says: ... > > > abort: crosses branches (merge branches or use --check to force update) > I got this error once by having uncommitted changes while > updating. I had to revert my changes before Mercurial would stop > complaining. Just something to check. I got the same result on two different machines, and I think I had an uncommitted change on ONE of them. On the one without (I think) changes: $ hg up tip 8 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg pull -u pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp searching for changes no changes found On the one WITH a change (and old hg - version 0.9): $ hg up tip this update spans a branch affecting the following files: doc/faq.xml modules/clx/new-clx/clx.f modules/clx/new-clx/clx.lisp modules/clx/new-clx/test.tst src/ChangeLog src/NEWS src/spvw_language.d win32msvc/nsis/env_var_update.nsh (resolve) aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) But my change was to src/unixaux.d, not mentioned above. So I suspect the difference is due to hg version. I continue with $ hg up -C 8 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg pull -u pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 785 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved I only hope everything is now in the right state. Also that I don't have to go through this in the future. |
From: Samir S. <ze...@gm...> - 2011-05-01 12:40:13
|
On Sat, Apr 30, 2011 at 11:22:16AM -0700, Don Cohen wrote: ... > On the one WITH a change (and old hg - version 0.9): ... > > I only hope everything is now in the right state. > Also that I don't have to go through this in the future. > I guess you have very good reason to use a so old version of mercurial :), since they issue probably 3 versions a year and the current versiona is 1.8.3, quite some changes are to be expected, and you may fall in other troubles later. if newer versions are not provided by your OS I would suggest easy_install from python setuptools (http://pypi.python.org/pypi/setuptools) before considering to build mercurial form source. Samir. |