From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from ar.aichi-u.ac.jp ([202.250.160.40]) by ttr; Sun May  4 22:04:56 EDT 2014
Received: from [192.168.1.105] ([125.193.25.135]) by ar; Mon May  5 11:04:46 JST 2014
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\))
Subject: Re: [9front] cwfs fsmempercent
From: arisawa <arisawa@ar.aichi-u.ac.jp>
In-Reply-To: <5e68664a37b65df6c26c6f3748a97173@felloff.net>
Date: Mon, 5 May 2014 11:04:44 +0900
Content-Transfer-Encoding: 7bit
Message-Id: <031CE5D8-F20C-41C8-B304-4CD5337464E9@ar.aichi-u.ac.jp>
List-ID: <9front.9front.org>
X-Glyph: ➈
X-Bullshit: template out-scaling control
References: <5e68664a37b65df6c26c6f3748a97173@felloff.net>
To: 9front@9front.org
X-Mailer: Apple Mail (2.1510)


> you could also just delete /dist/plan9front/.hg and copy
> it back from the iso (or from dump or whatever), then do a
> hg pull; then; hg update. 

I did.

what do you suspect?
of course I executed in allow mode.

term% auth/as glenda sysupdate
pulling from https://plan9front.googlecode.com/hg/
searching for changes
adding changesets
transaction abort!
rollback completed
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial@selenic.com
** Mercurial Distributed SCM (version unknown)
** Extensions loaded: 
Traceback (most recent call last):
  File "/bin/hg", line 39, in <module>
    mercurial.dispatch.run()
  File "/sys/lib/python/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/sys/lib/python/mercurial/dispatch.py", line 27, in dispatch
    return _runcatch(u, args)
  File "/sys/lib/python/mercurial/dispatch.py", line 43, in _runcatch
    return _dispatch(ui, args)
  File "/sys/lib/python/mercurial/dispatch.py", line 449, in _dispatch
    return runcommand(lui, repo, cmd, fullargs, ui, options, d)
  File "/sys/lib/python/mercurial/dispatch.py", line 317, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/sys/lib/python/mercurial/dispatch.py", line 501, in _runcommand
    return checkargs()
  File "/sys/lib/python/mercurial/dispatch.py", line 454, in checkargs
    return cmdfunc()
  File "/sys/lib/python/mercurial/dispatch.py", line 448, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/sys/lib/python/mercurial/util.py", line 402, in check
    return func(*args, **kwargs)
  File "/sys/lib/python/mercurial/commands.py", line 2305, in pull
    modheads = repo.pull(other, heads=revs, force=opts.get('force'))
  File "/sys/lib/python/mercurial/localrepo.py", line 1442, in pull
    return self.addchangegroup(cg, 'pull', remote.url())
  File "/sys/lib/python/mercurial/localrepo.py", line 2008, in addchangegroup
    if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
  File "/sys/lib/python/mercurial/revlog.py", line 1246, in addgroup
    text = self.revision(chain)
  File "/sys/lib/python/mercurial/revlog.py", line 999, in revision
    text = mdiff.patches(text, bins)
mpatch.mpatchError: patch cannot be decoded
term% 


On 2014/05/05, at 9:43, cinap_lenrek@felloff.net wrote:

> you could also just delete /dist/plan9front/.hg and copy
> it back from the iso (or from dump or whatever), then do a
> hg pull; then; hg update. hg is very good at not destroying
> local changes it doesnt know about.
> so even if you have an old .hg/ repository, but new working files,
> it will just report them as local modifications. once you
> hg pull and hg update, it should see that the files are all
> the same as in the repository and the modifications should
> be gone. hg status -q to verify.
> 
> --
> cinap