Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
hg-git
Commits
f2bc5833a808
Commit
f2bc5833
authored
Jan 01, 2021
by
Dan Villiom Podlaski Christiansen
Browse files
git_handler: detect and warn should history diverge
parent
67db7a10609a
Pipeline
#24244
failed with stages
in 2 minutes and 12 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
hggit/git_handler.py
View file @
f2bc5833
...
...
@@ -218,6 +218,11 @@
# FILE LOAD AND SAVE METHODS
def
map_set
(
self
,
gitsha
,
hgsha
):
if
gitsha
in
self
.
_map_git
and
self
.
_map_git
[
gitsha
]
!=
hgsha
:
self
.
ui
.
warn
(
b
'warning: overwriting mapped git commit!
\n
'
)
if
hgsha
in
self
.
_map_hg
and
self
.
_map_hg
[
hgsha
]
!=
gitsha
:
self
.
ui
.
warn
(
b
'warning: overwriting mapped mercurial commit!
\n
'
)
self
.
_map_git
[
gitsha
]
=
hgsha
self
.
_map_hg
[
hgsha
]
=
gitsha
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment