Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-windows-ci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
hg-windows-ci
Commits
464aa857
Commit
464aa857
authored
5 years ago
by
sliquister
Browse files
Options
Downloads
Patches
Plain Diff
amend: add a test for a simplified version of issue6157
Differential Revision:
https://phab.mercurial-scm.org/D6666
parent
b5092c23
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-amend.t
+17
-0
17 additions, 0 deletions
tests/test-amend.t
with
17 additions
and
0 deletions
tests/test-amend.t
+
17
−
0
View file @
464aa857
...
...
@@ -451,3 +451,20 @@
[
255
]
$
cd
..
Corner
case
of
amend
from
issue6157:
-
working
copy
parent
has
a
change
to
file
`
a
`
-
working
copy
has
the
inverse
change
-
we
amend
the
working
copy
parent
for
files
other
than
`
a
`
hg
includes
the
changes
to
`
a
`
anyway
.
$
hg
init
6157
;
cd
6157
$
echo
a
>
a
;
echo
b
>
b
;
hg
commit
-
qAm_
$
echo
a2
>
a
;
hg
commit
-
qm_
$
hg
diff
--
stat
-
c
.
a
|
2
+-
1
files
changed
,
1
insertions
(
+
),
1
deletions
(
-
)
$
echo
a
>
a
;
echo
b2
>
b
;
hg
amend
-
q b
$
hg
diff
--
stat
-
c
.
b
|
2
+-
1
files
changed
,
1
insertions
(
+
),
1
deletions
(
-
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment