[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Move to git is imminent - awaiting Stefan's approval
From: |
Óscar Fuentes |
Subject: |
Re: Move to git is imminent - awaiting Stefan's approval |
Date: |
Mon, 06 Jan 2014 22:29:48 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
Stefan Monnier <address@hidden> writes:
[snip]
> I'd also like:
>
> - Improve vc-git.el so that it can automatically enable smerge-mode when
> opening a conflicted file
We discussed a patch for this. IIRC it had the inconvenience of
requiring two git calls for each file, although in theory it was
possible to cache the results for the entire tree.
> 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).
The config var is important.
Here, conflict is considered solved only after testing the changes (does
it compile? does it pass the regression tests?.)
[snip]
- Move to git is imminent - awaiting Stefan's approval, Eric S. Raymond, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Jay Belanger, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Eli Zaretskii, 2014/01/06
- RE: Move to git is imminent - awaiting Stefan's approval, Drew Adams, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval, Stefan Monnier, 2014/01/06
- Re: Move to git is imminent - awaiting Stefan's approval,
Óscar Fuentes <=
- Re: Move to git is imminent - awaiting Stefan's approval, Stefan Monnier, 2014/01/06
- Automatically marking conflicts are resolved (was: Move to git is imminent - awaiting Stefan's approval), Óscar Fuentes, 2014/01/06
- Re: Automatically marking conflicts are resolved, David Kastrup, 2014/01/06
- Re: Automatically marking conflicts are resolved, Óscar Fuentes, 2014/01/06
- Re: Automatically marking conflicts are resolved, David Kastrup, 2014/01/07
- Re: Automatically marking conflicts are resolved, Óscar Fuentes, 2014/01/07
- Re: Automatically marking conflicts are resolved, David Kastrup, 2014/01/07
- Re: Automatically marking conflicts are resolved, Óscar Fuentes, 2014/01/07
- Re: Automatically marking conflicts are resolved, Stephen J. Turnbull, 2014/01/07
- Re: Move to git is imminent - awaiting Stefan's approval, Leo Liu, 2014/01/06