Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
mercurial-devel
Commits
bae2e9c8
Commit
bae2e9c8
authored
17 years ago
by
Bryan O'Sullivan
Browse files
Options
Downloads
Patches
Plain Diff
Tests for issue 1049
parent
0d4e068e
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test-commit
+18
-0
18 additions, 0 deletions
tests/test-commit
tests/test-commit.out
+11
-0
11 additions, 0 deletions
tests/test-commit.out
with
29 additions
and
0 deletions
tests/test-commit
+
18
−
0
View file @
bae2e9c8
...
...
@@ -85,4 +85,22 @@
cd
..
cd
..
cd
..
hg init issue1049
cd
issue1049
echo
a
>
a
hg ci
-Ama
echo
a
>>
a
hg ci
-mb
hg up 0
echo
b
>>
a
hg ci
-mc
HGMERGE
=
true
hg merge
echo
% should fail because we are specifying a file name
hg ci
-mmerge
a
echo
% should fail because we are specifying a pattern
hg ci
-mmerge
-I
a
echo
% should succeed
hg ci
-mmerge
exit
0
This diff is collapsed.
Click to expand it.
tests/test-commit.out
+
11
−
0
View file @
bae2e9c8
...
...
@@ -92,3 +92,14 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-foo-subdir
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should fail because we are specifying a file name
abort: cannot partially commit a merge (do not specify files or patterns)
% should fail because we are specifying a pattern
abort: cannot partially commit a merge (do not specify files or patterns)
% should succeed
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