[PATCH 1 of 1] subrepo: check for dirty warns on missing revision instead of abort
Matt Mackall
mpm at selenic.com
Fri May 13 09:51:45 CDT 2011
On Fri, 2011-05-13 at 14:43 +0200, Friedrich Kastner-Masilko wrote:
> Zitat von Matt Mackall <mpm at selenic.com>:
>
> > This patch seems unnecessarily complex. Does this do what you want?
> >
> > diff -r 9bbac962f4dd mercurial/subrepo.py
> > --- a/mercurial/subrepo.py Thu May 12 20:27:35 2011 +0200
> > +++ b/mercurial/subrepo.py Thu May 12 18:27:46 2011 -0500
> > @@ -408,7 +408,7 @@
> > if r == '' and not ignoreupdate: # no state recorded
> > return True
> > w = self._repo[None]
> > - if w.p1() != self._repo[r] and not ignoreupdate:
> > + if r != w.p1().node() and not ignoreupdate:
Sorry, .node() here needs to be .hex().
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list