These operation failed at some point, comments below: > $ hg clone http://hg.globulation2.org/glob2 > destination directory: glob2 > requesting all changes > adding changesets > adding manifests > adding file changes > added 3891 changesets with 20278 changes to 3716 files (+4 heads) > updating working directory > 2455 files updated, 0 files merged, 0 files removed, 0 files unresolved > $ cd glob2 > $ hg strip 3885 > saving bundle to > /home/plouj/work/glob2/.hg/strip-backup/b98c990c50d8-backup saving bundle > to /home/plouj/work/glob2/.hg/strip-backup/b98c990c50d8-temp adding branch > adding changesets > adding manifests > adding file changes > added 5 changesets with 10 changes to 7 files (+1 heads) > $ echo -e '[diff]\ngit=True' >> .hg/hgrc > $ hg qimport -r 3881:3883 > $ hg qseries > 0 A 3881.diff > 1 A 3882.diff > 2 A 3883.diff > $ hg checkout -q 3883 > 661 files updated, 0 files merged, 614 files removed, 0 files unresolved > $ hg qpop 3881.diff > saving bundle to /home/plouj/work/glob2/.hg/strip-backup/9ff115d7065a-temp > adding branch > adding changesets > adding manifests > adding file changes > added 6 changesets with 45 changes to 42 files (+1 heads) > Now at: 3881.diff > $ hg qfold 3882.diff > saving bundle to /home/plouj/work/glob2/.hg/strip-backup/697e24c18cc6-temp > adding branch > adding changesets > adding manifests > adding file changes > added 6 changesets with 45 changes to 42 files > Patch queue now empty > (working directory not at tip) > applying 3881.diff > patching file .hgignore > Hunk #1 FAILED at 2 > 1 out of 1 hunk FAILED -- saving rejects to file .hgignore.rej > patch failed, unable to continue (try -v) > patch failed, rejects left in working dir > Errors during apply, please fix and refresh 3881.diff > $ cat .hgignore.rej > --- .hgignore > +++ .hgignore > @@ -3,10 +3,11 @@ > config.* > options_cache.py > libgag.a > +libusl.a > src/glob2 > .sconf_temp > .sconsign.dblite > -src/*.o > +.directory > +*.o > *~ > -.directory > -scons/*.pyc > +*.pyc > $ cat .hgignore > syntax: glob > > config.* > options_cache.py > libgag.a > libusl.a > src/glob2 > .sconf_temp > .sconsign.dblite > .directory > *.o > *~ > *.pyc > $ vim .hgignore > $ hg diff > diff --git a/.hgignore b/.hgignore > --- a/.hgignore > +++ b/.hgignore > @@ -7,7 +7,6 @@ > src/glob2 > .sconf_temp > .sconsign.dblite > -.directory > *.o > *~ > *.pyc > $ hg qrefresh
Here, I got the following exception instead of the blank line: ** unknown exception encountered, details follow ** report bug details to http://www.selenic.com/mercurial/bts ** or [EMAIL PROTECTED] ** Mercurial Distributed SCM (version 0.9.5) Traceback (most recent call last): File "/usr/bin/hg", line 14, in <module> mercurial.dispatch.run() File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 20, in run sys.exit(dispatch(sys.argv[1:])) File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 29, in dispatch return _runcatch(u, args) File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 45, in _runcatch return _dispatch(ui, args) File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 348, in _dispatch ret = _runcommand(ui, options, cmd, d) File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 401, in _runcommand return checkargs() File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 357, in checkargs return cmdfunc() File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 340, in <lambda> d = lambda: func(ui, repo, *args, **cmdoptions) File "/var/lib/python-support/python2.5/hgext/mq.py", line 1649, in refresh ret = q.refresh(repo, pats, msg=message, **opts) File "/var/lib/python-support/python2.5/hgext/mq.py", line 1048, in refresh repo.dirstate.remove(f) File "/var/lib/python-support/python2.5/mercurial/dirstate.py", line 247, in remove self._decpath(f) File "/var/lib/python-support/python2.5/mercurial/dirstate.py", line 192, in _decpath if dirs[base] == 1: KeyError: 'datasrc/gfx/areas' Then, if I try again a qrefresh, I get: [EMAIL PROTECTED]:~/g2fix/glob2$ hg qrefresh abort: working directory revision is not qtip > $ rm .hgignore.rej > $ hg qpush -a > applying 3883.diff > Now at: 3883.diff > $ hg qdelete -r qbase:qtip > $ hg qseries > $ hg branch > folderStructure > # after this point, Leo has to re-do his merge between > tip(4d510ca732d3) and b54276b85632. I only provide the following > commands as a guess: > $ hg merge -r b54276b85632 > remote changed src/GameHeader.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameHints.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapGenerationDescriptor.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/Game.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapScriptUSL.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapEditDialog.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/Map.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameGUI.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/Game.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed website/index.html which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapScriptUSL.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapEditDialog.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameObjectives.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/libusl/src/debug.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapHeader.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/Map.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameGUI.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MultiplayerGame.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/libgag/GraphicContext.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapEdit.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameHeader.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/Unit.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/MapHeader.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/YOGClientMapDownloadScreen.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/NetGamePlayerManager.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/libgag/SDLGraphicContext.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/Unit.h which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameGUIDialog.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/GameObjectives.cpp which local deleted > use (c)hanged version or leave (d)eleted? c > remote changed src/NetGamePlayerManager.h which local deleted > use (c)hanged version or leave (d)eleted? c > 81 files updated, 0 files merged, 0 files removed, 0 files unresolved > (branch merge, don't forget to commit) > $ hg commit -m "merged" > > I hope this helps. If you do not know what to do, I suggest that we use your "fixed" version. I have made a backup of the whole tree anyway. We can upload your fixed version and let people test it. In order to avoid commits during our tests, I have temporary disabled https write access. Thank you, have a nice day, Steph -- http://stephane.magnenat.net _______________________________________________ glob2-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
