Mercurial > hg
view tests/test-issue619.t @ 12796:bc69ba99e34b stable
mercurial.el: fix hg-outgoing path when 'default-push' is not defined
hg-outgoing path is set as 'default-push' which prevents it from working in
repos which only have 'default' defined.
Fix provided by Kyujin Shim at
http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html
author | Azhagu Selvan SP <tamizhgeek@gmail.com> |
---|---|
date | Wed, 20 Oct 2010 18:15:47 +0530 |
parents | 3b165c127690 |
children | 9e7e24052745 |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue619 $ hg init $ echo a > a $ hg ci -Ama adding a $ echo b > b $ hg branch b marked working directory as branch b $ hg ci -Amb adding b $ hg co -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Fast-forward: $ hg merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -Ammerge Bogus fast-forward should fail: $ hg merge b abort: merging with a working directory ancestor has no effect [255]