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
Show more breadcrumbs
mercurial
hg-git
Commits
bd5467169d3c
Commit
bd5467169d3c
authored
11 years ago
by
durin42
Browse files
Options
Downloads
Patches
Plain Diff
test-subrepos: cope with unsorted output in .hgsub
parent
6da65b534370
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-subrepos.t
+4
-4
4 additions, 4 deletions
tests/test-subrepos.t
with
4 additions
and
4 deletions
tests/test-subrepos.t
+
4
−
4
View file @
bd546716
...
...
@@ -38,5 +38,6 @@
$
hg
bookmarks
-
f
-
r
default
master
1
.
Ensure
gitlinks
are
transformed
to
.
hgsubstate
on
hg
<-
git
pull
.
hgsub
shall
list
two
[
git
]
subrepos
$
cat
.
hgsub
$
cat
.
hgsub
|
sort
subrepo1
=
[
git
]
../
gitsubrepo
xyz
/subrepo2 = [git]../gi
tsubrepo
...
...
@@ -42,5 +43,4 @@
xyz
/subrepo2 = [git]../gi
tsubrepo
subrepo1
=
[
git
]
../
gitsubrepo
.
hgsubstate
shall
list
two
idenitcal
revisions
$
cat
.
hgsubstate
56
f0304c5250308f14cfbafdc27bd12d40154d17
subrepo1
...
...
@@ -108,5 +108,5 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
pull shall bring .hgsub entry which was added to the git repo
$ cat hgrepo/.hgsub
$ cat hgrepo/.hgsub
| sort
hgsub = $TESTTMP/hgsub
...
...
@@ -112,2 +112,3 @@
hgsub = $TESTTMP/hgsub
subrepo1 = [git]../gitsubrepo
xyz/subrepo2 = [git]../gitsubrepo
...
...
@@ -113,5 +114,4 @@
xyz/subrepo2 = [git]../gitsubrepo
subrepo1 = [git]../gitsubrepo
.hgsubstate shall list revision of the subrepo added through git repo
$ cat hgrepo/.hgsubstate
481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub
...
...
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