1 Apr 2003 01:04
Re: [PATCH] vc-svn: vc-merge, avoid status checks
Stefan Monnier <monnier+gmane.comp.version-control.subversion.devel/news/ <at> rum.cs.yale.edu>
2003-03-31 23:04:01 GMT
2003-03-31 23:04:01 GMT
>> Indeed, VC lacks a notion of "file with unresolved conflicts". Maybe >> we should add it to the possible return values of vc-state. > Yes, or it could perhaps be handled as another vc property of the > file. It might be nice to have a "conflicted" flag in the modeline. I don't think it needs to be a property. After all, if a file is conflicted, it obviously will be neither up-to-date nor needs-patch not needs-merge (nor locked, of course), so it makes sense to have it as a state. > I think it can be done with no need for an option: > if people want updates, they can (with this patch) run vc-merge. > if we try to commit and we're not uptodate, we can detect that as > vc-cvs does. That's what I made possible for vc-cvs.el (which originally had no way to "stay local" and was thus unusable with slow repositories). But it turns out that some people really enjoy being told right away that the commit will fail (obviously their repository is zippy), so Andre Spiegel introduced the vc-cvs-stay-local configuration variable. I think it makes sense to have a vc-stay-local variable and have both vc-cvs and vc-cvn obey it (while maybe still having their own vc-foo-stay-local). >> Good to hear. This is a serious problem with CVS where recovering the >> `ancestor' and the `other' can be difficult. Now I think this is >> a good argument for re-introducing a way to call ediff from VC >> (in the current CVS code for Emacs, this has been removed and VC(Continue reading)
RSS Feed