Understanding mercurial.

[Thomas Arendsen Hein]

* Thomas Arendsen Hein <thomas at intevation.de> [20050730 15:47]:
> * Erik Bågfors <zindar at gmail.com> [20050730 15:01]:
> > Then I get the following
> > remote changed passwd which local deleted
> > (k)eep or (d)elete? d
> > Traceback (most recent call last):
> >   File "/usr/bin/hg", line 13, in ?
> >       commands.run()
> >   File "/usr/lib/python2.4/site-packages/mercurial/commands.py", line
> > 750, in run
> >      sys.exit(dispatch(sys.argv[1:]))
> >   File "/usr/lib/python2.4/site-packages/mercurial/commands.py", line
> > 812, in dispatch
> >      return d()
> >   File "/usr/lib/python2.4/site-packages/mercurial/commands.py", line
> > 796, in <lambda>
> >      d = lambda: i[0](u, repo, *args, **cmdoptions)
> >   File "/usr/lib/python2.4/site-packages/mercurial/commands.py", line
> > 654, in update
> >      return repo.update(node, allow=merge, force=clean)
> >   File "/usr/lib/python2.4/site-packages/mercurial/hg.py", line 1182, in update
> >      os.unlink(f)
> >      OSError: [Errno 2] No such file or directory: 'passwd'
> 
> This looks like a bug in Mercurial. Can you check if this happens in
> the current tip version, too?

Ah, you listed all needed commands to reproduce this. The bug is
already fixed in tip.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/