Mercurial > hg
comparison hgext/extdiff.py @ 21704:65dd65c645ed stable
keyword: suppress keyword expansion while 'hg rebase' for internal merge
Before this patch, 'hg rebase' may cause unexpected conflict, if 'hg
rebase'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.
This patch suppresses keyword expansion while 'hg rebase' for internal
merge by adding 'rebase' to 'restricted' command list like 'merge'.
This patch specifies '--keep' to 'hg rebase', because revision #10 is
useful also for tests in succeeding patches.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 05 Jun 2014 16:47:13 +0900 |
parents | 2aafd5854243 |
children | 29eeaa6d662f |
comparison
equal
deleted
inserted
replaced
21703:99f7e5fe35f2 | 21704:65dd65c645ed |
---|