D7521: amend: check for file modifications when updating dirstate (issue6233)
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Dec 6 14:55:55 UTC 2019
pulkit added a comment.
I get the following test failure:
--- /home/pulkit/repo/hgpush/tests/test-amend.t
+++ /home/pulkit/repo/hgpush/tests/test-amend.t#obsstore-off.err
@@ -505,4 +505,23 @@
> hg diff
> hg status
> fi
- OK.
+ $TESTTMP.sh: 292: $TESTTMP.sh: [[: not found
+ Bug detected. 'delta' is not part of the commit OR the wdir
+ Diff and status before rebuild:
+ diff --git a/foo b/foo
+ --- a/foo
+ +++ b/foo
+ @@ -1,2 +1,3 @@
+ alpha
+ beta
+ +delta
+ M foo
+ Diff and status after rebuild:
+ diff --git a/foo b/foo
+ --- a/foo
+ +++ b/foo
+ @@ -1,2 +1,3 @@
+ alpha
+ beta
+ +delta
+ M foo
ERROR: test-amend.t#obsstore-off output changed
!.
--- /home/pulkit/repo/hgpush/tests/test-amend.t
+++ /home/pulkit/repo/hgpush/tests/test-amend.t#obsstore-on.err
@@ -505,4 +505,23 @@
> hg diff
> hg status
> fi
- OK.
+ $TESTTMP.sh: 317: $TESTTMP.sh: [[: not found
+ Bug detected. 'delta' is not part of the commit OR the wdir
+ Diff and status before rebuild:
+ diff --git a/foo b/foo
+ --- a/foo
+ +++ b/foo
+ @@ -1,2 +1,3 @@
+ alpha
+ beta
+ +delta
+ M foo
+ Diff and status after rebuild:
+ diff --git a/foo b/foo
+ --- a/foo
+ +++ b/foo
+ @@ -1,2 +1,3 @@
+ alpha
+ beta
+ +delta
+ M foo
REPOSITORY
rHG Mercurial
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7521/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7521
To: spectral, #hg-reviewers, mharbison72, pulkit
Cc: mharbison72, mercurial-devel
More information about the Mercurial-devel
mailing list