Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
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
Admin message
This instance will be upgraded to Heptapod 17.9.2 on 2025-04-24 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
mercurial
hg-git
Commits
24b80a95
Commit
24b80a95
authored
11 years ago
by
durin42
Browse files
Options
Downloads
Patches
Plain Diff
tests: fix output expectations from
3ff09f0fac7a
parent
3ff09f0f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test-outgoing.t
+1
-1
1 addition, 1 deletion
tests/test-outgoing.t
tests/test-push.t
+2
-2
2 additions, 2 deletions
tests/test-push.t
with
3 additions
and
3 deletions
tests/test-outgoing.t
100755 → 100644
+
1
−
1
View file @
24b80a95
...
...
@@ -91,7 +91,7 @@
this
will
fail
# maybe we should try to make it work
$
hg
outgoing
comparing
with
*/
gitrepo
(
glob
)
abort:
refs
/heads/mas
ter
changed
on
the
server
,
please
pull
and
merge
before
pushing
abort:
branch
'
refs/heads/master
'
changed
on
the
server
,
please
pull
and
merge
before
pushing
[
255
]
let
'
s pull and try again
$ hg pull 2>&1 | grep -v
'
divergent
bookmark
'
...
...
This diff is collapsed.
Click to expand it.
tests/test-push.t
+
2
−
2
View file @
24b80a95
...
...
@@ -58,10 +58,10 @@
$
hg
push
-
r
master
pushing
to
$TESTTMP
/
gitrepo
searching
for
changes
abort:
refs
/heads/mas
ter
changed
on
the
server
,
please
pull
and
merge
before
pushing
abort:
branch
'
refs/heads/master
'
changed
on
the
server
,
please
pull
and
merge
before
pushing
[
255
]
...
even
with
-
f
$
hg
push
-
fr
master
pushing
to
$TESTTMP
/
gitrepo
searching
for
changes
...
...
@@ -62,10 +62,10 @@
[
255
]
...
even
with
-
f
$
hg
push
-
fr
master
pushing
to
$TESTTMP
/
gitrepo
searching
for
changes
abort:
refs
/heads/mas
ter
changed
on
the
server
,
please
pull
and
merge
before
pushing
abort:
branch
'
refs/heads/master
'
changed
on
the
server
,
please
pull
and
merge
before
pushing
[
255
]
$
hg
pull
2
>&
1
|
grep
-
v
'
divergent bookmark
'
...
...
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