Questions tagged [mercurial]

6 questions
5
votes
1 answer

Insert and strip helpful comments from vc commit message buffer

When I run hg commit (or git commit, same difference...) from the command line without supplying a commit message it pops up an emacs buffer with the following contents: . . HG: Enter commit message. Lines beginning with 'HG:' are removed. HG:…
2
votes
2 answers

How to use ediff with (hg) changesets?

I have not found a good way to use ediff with Mercurial changsets. What I want is basically the functionality of vc-dir, but for committed changesets. The input should be a changeset identifier, and I want an overview of the changed files, and an…
1
vote
0 answers

Possible to make vc-dir aware of (hg) subrepo changes?

vc-dir works really well for most of my needs, as I use both hg and svn repositories. But most of the hg repos I work with have subrepositories. I typically use vc-dir buffers for each of the subrepos and the top level repo. The problem is that a…
ned_zeppelin
  • 113
  • 6
1
vote
0 answers

include hg subrepository in projectile

I am using projectile in a project with many externals (hg subrepositories). Each subrepository is treated as a separate project by Projectile. Is there any way to configure Projectile to automatically include subrepos to the main project? Or…
ned_zeppelin
  • 113
  • 6
0
votes
1 answer

How to abort an ediff merge?

I use ediff to merge mercurial conflicts (and sometimes git conflicts), but I can't seem to abort. Ediff pops up as soon as a conflict is detected, and quitting and not saving results in mercurial accepting the existing version and drops the…
0
votes
1 answer

Is that possible to Emacs to respect .gitattributes and .hgeol?

Is that possible to Emacs to respect .gitattributes and .hgeol? I am again on Windows with Cygwin emacs-w32 and would like if Emacs honor project specific CR/LF settings for new files...
gavenkoa
  • 3,352
  • 19
  • 36