[PATCH [RFC][V2]] revert: add support for reverting subrepos

[Angel Ezquerra]

On Jan 15, 2012 7:10 AM, "Matt Mackall" <mpm at selenic.com> wrote:
>
> On Sun, 2012-01-15 at 04:31 +0100, Angel Ezquerra wrote:
> > >
> > > On Oct 15, I wrote:
> > >
> > > "There's a bit too much uncertainty here still. Let's revisit this
after
> > > Nov 1st."
> > >
> > > http://markmail.org/message/3jxty7xlucqmnscw
> > >
> > > Ok, it is indeed after Nov 1st, but I think you missed the point. It
is
> > > Jan 14th, and the code freeze is AGAIN just days away. Given that this
> > > patch is definitely still not ready to go in without more discussion
and
> > > tweaking and I have lots of other stuff to address in the next few
days,
> > > I have to drop this patch again, for the same reason.
> > >
> > > Please resend your patch for discussion on Feb 2. Don't wait until
> > > April.
> >
> > :-) actually I did not miss your point, I've just been too busy to look
> > into this until quite recently.
> >
> > I expected that it was too late to include it in the next stable release
> > and I'm fine with it.
> >
> > If possible I'd like some guidance on how to move forward with this
patch.
> > I'm a bit stuck trying to find the proper way to remove a subrepo that
has
> > been added or removed but not committed without manually modifying the
> > .hgsub and the .hgsubstate files.
>
> Touching .hgsubstate here is almost certainly wrong: it gets regenerated
> on commit, so its contents in the working directory are largely
> irrelevant.
>
> Similarly touching .hgsub is also wrong: it's "owned" by the user, is
> written in a non-trivial config language (like hgrc) and is otherwise
> never edited by Mercurial itself with the exception of going through the
> normal 3-way merge process.
>
> So we'll probably need to generate a warning that manual intervention is
> needed (or something).
>
> But let's wait to discuss this further, please.
>

Thanks, that's the kind of guidance I was looking for. I'll resend a patch
before April ;-)

Angel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120115/fdf5a041/attachment.html>