Skip to content
Snippets Groups Projects
Commit 3c311a582d84 authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

merge branch 0.10.x into 1.0.x

No related branches found
No related tags found
No related merge requests found
Pipeline #46000 passed
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
- "3.6" - "3.6"
- "3.10" - "3.10"
HG: HG:
- "6.0" - "6.1"
# This is the authoritative list of versions of Mercurial that this # This is the authoritative list of versions of Mercurial that this
# extension is supported and tested with; it should be kept in sync # extension is supported and tested with; it should be kept in sync
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
- "5.7" - "5.7"
- "5.8" - "5.8"
- "5.9" - "5.9"
- "6.0"
# Test that it is possible to use and run hg-git on Ubuntu without # Test that it is possible to use and run hg-git on Ubuntu without
# compiling any C code, i.e. with stock Dulwich, Mercurial and # compiling any C code, i.e. with stock Dulwich, Mercurial and
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
b'collections', b'collections',
} }
testedwith = b'5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0' testedwith = b'5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1'
minimumhgversion = b'5.2' minimumhgversion = b'5.2'
buglink = b'https://foss.heptapod.net/mercurial/hg-git/issues' buglink = b'https://foss.heptapod.net/mercurial/hg-git/issues'
......
...@@ -226,6 +226,7 @@ ...@@ -226,6 +226,7 @@
Create a git tag from hg, but pointing to a new commit: Create a git tag from hg, but pointing to a new commit:
$ hg tag --git gamma --debug -r tip $ hg tag --git gamma --debug -r tip
invalid branch cache (visible): tip differs (?)
adding git tag gamma adding git tag gamma
finding unexported changesets finding unexported changesets
exporting 1 changesets exporting 1 changesets
......
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
warning: path 'nested/.hg/requires' contains an invalid path component warning: path 'nested/.hg/requires' contains an invalid path component
warning: path 'nested/.hg/store/requires' contains an invalid path component (?) warning: path 'nested/.hg/store/requires' contains an invalid path component (?)
new changesets [0-9a-f]{12,12} \(1 drafts\) (re) new changesets [0-9a-f]{12,12} \(1 drafts\) (re)
warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out. (?)
updating to branch default (no-hg57 !) updating to branch default (no-hg57 !)
updating to bookmark master (hg57 !) updating to bookmark master (hg57 !)
abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested' abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment