[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bazaar to Git status
From: |
Eric S. Raymond |
Subject: |
Re: Bazaar to Git status |
Date: |
Sun, 10 Aug 2014 21:17:06 -0400 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Glenn Morris <address@hidden>:
> "Eric S. Raymond" wrote:
>
> > You haven't heard much about it because the hard work is all done. I
> > have the scripts ready to go and need only about eight hours' notice
> > before pushing the button.
>
> I'm pretty sure there was a list of other things that needed to be done,
> beside "replace old revision references". I hope someone was keeping a
> list of the various items that were requested, so that we don't have to
> go through it all over again.
>
> Eg what will replace bzr --fixes, bzrmerge.el, vc-git.el improvements,
> etc, etc.
I've been maintaining that list. It's the file transition.txt in the
conversion-machinery repo.
To the best of my knowledge, the only major un-done task for before the
conversion is this one:
* Better cross-VCS integration of smerge in vc.el. Here are Stefan's
requirements:
- Improve vc-git.el so that it can automatically enable smerge-mode when
opening a conflicted file and (probably conditional on a config var)
mark the file as "not conflicted any more" when saving with no
remaining diff3 markers.
This currently works in vc-bzr.el (and vc-svn.el as well, IIRC).
- Improve vc-git.el with vc-git-conflicted-files so that
vc-find-conflicted-files works for Git as well.
See RĂ¼diger Sonderfeld's patch proposal:
https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html
What really needs to happen here, I think, is for the smerge support
to be moved into the core vc code rather than being a set of disjoint
per-VC kluges.
I reckon this to be about a day and a half of work. I'll schedule
it when we start seriously discussing a cutover date.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
- Bazaar to Git status, Paul Michael Reilly, 2014/08/10
- Re: Bazaar to Git status, Jan Nieuwenhuizen, 2014/08/10
- Re: Bazaar to Git status, Stefan Monnier, 2014/08/10
- Re: Bazaar to Git status, Eric S. Raymond, 2014/08/10
- Re: Bazaar to Git status, Paul Michael Reilly, 2014/08/10
- Re: Bazaar to Git status, Glenn Morris, 2014/08/10
- Re: Bazaar to Git status,
Eric S. Raymond <=
- Re: Bazaar to Git status, Glenn Morris, 2014/08/11
- Re: Bazaar to Git status, Eric S. Raymond, 2014/08/11
- Re: Bazaar to Git status, David Kastrup, 2014/08/11
- Re: Bazaar to Git status, Stephen J. Turnbull, 2014/08/11
- Re: Bazaar to Git status, David Kastrup, 2014/08/12
- Re: Bazaar to Git status, Glenn Morris, 2014/08/11
- Re: Bazaar to Git status, Stefan Monnier, 2014/08/11