[Updated] D11400: narrow: fix commits of empty files
valentin.gatienbaron (Valentin Gatien-Baron)
phabricator at mercurial-scm.org
Mon Sep 13 13:22:03 UTC 2021
valentin.gatienbaron updated this revision to Diff 30209.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11400?vs=30203&id=30209
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11400/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11400
AFFECTED FILES
mercurial/commit.py
tests/test-narrow-commit.t
CHANGE DETAILS
diff --git a/tests/test-narrow-commit.t b/tests/test-narrow-commit.t
--- a/tests/test-narrow-commit.t
+++ b/tests/test-narrow-commit.t
@@ -105,14 +105,7 @@
$ hg debugdirstate --no-dates
n 644 10 set inside/f1
-Can't commit empty files
+Can commit empty files
$ touch inside/c; hg add inside/c; hg commit -qm _; hg verify -q
- warning: revlog 'data/inside/c.i' not in fncache!
- 4: empty or missing inside/c
- inside/c at 4: manifest refers to unknown revision 000000000000
- 1 warnings encountered!
- hint: run "hg debugrebuildfncache" to recover from corrupt fncache
- 2 integrity errors encountered!
- (first damaged changeset appears to be 4)
- [1]
+ $ hg cat -r . inside/c
diff --git a/mercurial/commit.py b/mercurial/commit.py
--- a/mercurial/commit.py
+++ b/mercurial/commit.py
@@ -389,6 +389,7 @@
text = fctx.data()
if (
fparent2 != repo.nullid
+ or fparent1 == repo.nullid
or meta
or flog.cmp(fparent1, text)
or force_new_node
To: valentin.gatienbaron, durin42, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210913/5cd61e26/attachment-0002.html>
More information about the Mercurial-patches
mailing list