equal
deleted
inserted
replaced
479 "hg debugsetparents" to merge without ancestor check by "hg merge", |
479 "hg debugsetparents" to merge without ancestor check by "hg merge", |
480 and (2) the extension to allow filelog merging between the revision |
480 and (2) the extension to allow filelog merging between the revision |
481 and its ancestor by overriding "repo._filecommit". |
481 and its ancestor by overriding "repo._filecommit". |
482 |
482 |
483 $ cat > ../legacyrepo.py <<EOF |
483 $ cat > ../legacyrepo.py <<EOF |
484 > from __future__ import absolute_import |
|
485 > from mercurial import commit, error, extensions |
484 > from mercurial import commit, error, extensions |
486 > def _filecommit(orig, repo, fctx, manifest1, manifest2, |
485 > def _filecommit(orig, repo, fctx, manifest1, manifest2, |
487 > linkrev, tr, includecopymeta, ms): |
486 > linkrev, tr, includecopymeta, ms): |
488 > fname = fctx.path() |
487 > fname = fctx.path() |
489 > text = fctx.data() |
488 > text = fctx.data() |