Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-windows-ci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
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-windows-ci
Commits
33e1b2d4
Commit
33e1b2d4
authored
11 years ago
by
durin42
Browse files
Options
Downloads
Plain Diff
Merge histedit fixes from stable.
parents
3af3a165
f6b047cf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hgext/histedit.py
+1
-1
1 addition, 1 deletion
hgext/histedit.py
tests/test-histedit-fold.t
+35
-1
35 additions, 1 deletion
tests/test-histedit-fold.t
with
36 additions
and
2 deletions
hgext/histedit.py
+
1
−
1
View file @
33e1b2d4
...
...
@@ -247,7 +247,7 @@
files
.
update
(
ctx
.
files
())
# Recompute copies (avoid recording a -> b -> a)
copied
=
copies
.
pathcopies
(
first
,
last
)
copied
=
copies
.
pathcopies
(
base
,
last
)
# prune files which were reverted by the updates
def
samefile
(
f
):
...
...
This diff is collapsed.
Click to expand it.
tests/test-histedit-fold.t
+
35
−
1
View file @
33e1b2d4
...
...
@@ -186,7 +186,7 @@
$ hg commit -m
'
+
5
'
$ echo 6 >> file
$ hg commit -m
'
+
6
'
$ hg logt -G
--template
'{
rev
}:{
node
|
short
}
{
desc
|
firstline
}
\
n
'
$ hg logt -G
@ 3:251d831eeec5 +6
|
o 2:888f9082bf99 +5
...
...
@@ -266,3 +266,37 @@
+6
$ cd ..
Folding with initial rename (issue3729)
---------------------------------------
$ hg init fold-rename
$ cd fold-rename
$ echo a > a.txt
$ hg add a.txt
$ hg commit -m a
$ hg rename a.txt b.txt
$ hg commit -m rename
$ echo b >> b.txt
$ hg commit -m b
$ hg logt --follow b.txt
2:e0371e0426bc b
1:1c4f440a8085 rename
0:6c795aa153cb a
$ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF | fixbundle
> pick 1c4f440a8085 rename
> fold e0371e0426bc b
> EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
reverting b.txt
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg logt --follow b.txt
1:cf858d235c76 rename
0:6c795aa153cb a
$ cd ..
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