Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
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
Environments
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.0rc1 on 2025-03-27 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
mercurial
mercurial-devel
Commits
012c719103ab
Commit
012c719103ab
authored
13 years ago
by
Nicolas Dumazet
Browse files
Options
Downloads
Patches
Plain Diff
tests: change test-rebase-detach to use bundle/rebase.hg
parent
d7f80dbbaf49
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-rebase-detach.t
+112
-63
112 additions, 63 deletions
tests/test-rebase-detach.t
with
112 additions
and
63 deletions
tests/test-rebase-detach.t
+
112
−
63
View file @
012c7191
...
...
@@ -10,30 +10,15 @@
$
hg
init
a
$
cd
a
$
echo
A
>
A
$
hg
ci
-
Am
A
adding
A
$
echo
B
>
B
$
hg
ci
-
Am
B
adding
B
$
echo
C
>
C
$
hg
ci
-
Am
C
adding
C
$
echo
D
>
D
$
hg
ci
-
Am
D
adding
D
$
hg
up
-
q -C
0
$
echo
E
>
E
$
hg
ci
-
Am
E
adding
E
created
new
head
$
hg
unbundle
$TESTDIR
/bundles/
rebase
.
hg
adding
changesets
adding
manifests
adding
file
changes
added
8
changesets
with
7
changes
to
7
files
(
+
2
heads
)
(
run
'
hg heads
'
to
see
heads
,
'
hg merge
'
to
merge
)
$
hg
up
tip
3
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
cd
..
...
...
@@ -36,10 +21,10 @@
$
cd
..
Rebasing
D
onto
E
detaching
from
C:
Rebasing
D
onto
H
detaching
from
C:
$
hg
clone
-
q -u
.
a
a1
$
cd
a1
$
hg
tglog
...
...
@@ -41,7 +26,7 @@
$
hg
clone
-
q -u
.
a
a1
$
cd
a1
$
hg
tglog
@
4
:
'
E
'
@
7
:
'
H
'
|
...
...
@@ -47,4 +32,10 @@
|
|
o
6
:
'
G
'
|/|
o
|
5
:
'
F
'
|
|
|
o
4
:
'
E
'
|/
|
o
3
:
'
D
'
|
|
|
o
2
:
'
C
'
...
...
@@ -53,7 +44,7 @@
|/
o
0
:
'
A
'
$
hg
rebase
--
detach
-
s 3 -d
4
$
hg
rebase
--
detach
-
s 3 -d
7
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
...
...
@@ -57,5 +48,7 @@
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'D'
@ 7: 'D'
|
o 6: 'H'
|
...
...
@@ -61,6 +54,10 @@
|
o 3: 'E'
|
| o 5: 'G'
|/|
o | 4: 'F'
| |
| o 3: 'E'
|/
| o 2: 'C'
| |
| o 1: 'B'
...
...
@@ -70,8 +67,9 @@
$ hg manifest
A
D
E
F
H
$ cd ..
...
...
@@ -74,10 +72,10 @@
$ cd ..
Rebasing C onto
E
detaching from B:
Rebasing C onto
H
detaching from B:
$ hg clone -q -u . a a2
$ cd a2
$ hg tglog
...
...
@@ -79,7 +77,7 @@
$ hg clone -q -u . a a2
$ cd a2
$ hg tglog
@
4
: '
E
'
@
7
: '
H
'
|
...
...
@@ -85,4 +83,10 @@
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3
:
'
D
'
|
|
|
o
2
:
'
C
'
...
...
@@ -91,7 +95,7 @@
|/
o
0
:
'
A
'
$
hg
rebase
--
detach
-
s 2 -d
4
$
hg
rebase
--
detach
-
s 2 -d
7
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
...
...
@@ -95,5 +99,9 @@
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 4: 'D'
@ 7: 'D'
|
o 6: 'C'
|
o 5: 'H'
|
...
...
@@ -99,8 +107,10 @@
|
o 3: 'C'
|
o 2
:
'
E
'
|
| o 4: 'G'
|/|
o | 3: 'F'
| |
| o 2
:
'
E
'
|/
|
o
1
:
'
B
'
|/
o
0
:
'
A
'
...
...
@@ -109,8 +119,9 @@
A
C
D
E
F
H
$
cd
..
...
...
@@ -113,10 +124,10 @@
$
cd
..
Rebasing
B
onto
E
using
detach
(
same
as
not
using
it
):
Rebasing
B
onto
H
using
detach
(
same
as
not
using
it
):
$
hg
clone
-
q -u
.
a
a3
$
cd
a3
$
hg
tglog
...
...
@@ -118,7 +129,7 @@
$
hg
clone
-
q -u
.
a
a3
$
cd
a3
$
hg
tglog
@
4
:
'
E
'
@
7
:
'
H
'
|
...
...
@@ -124,4 +135,10 @@
|
|
o
6
:
'
G
'
|/|
o
|
5
:
'
F
'
|
|
|
o
4
:
'
E
'
|/
|
o
3
:
'
D
'
|
|
|
o
2
:
'
C
'
...
...
@@ -130,7 +147,7 @@
|/
o
0
:
'
A
'
$
hg
rebase
--
detach
-
s 1 -d
4
$
hg
rebase
--
detach
-
s 1 -d
7
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
...
...
@@ -134,5 +151,5 @@
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@
4
: 'D'
@
7
: 'D'
|
...
...
@@ -138,3 +155,5 @@
|
o 3: 'C'
o 6: 'C'
|
o 5: 'B'
|
...
...
@@ -140,3 +159,3 @@
|
o
2
: '
B
'
o
4
: '
H
'
|
...
...
@@ -142,6 +161,10 @@
|
o 1: 'E'
|
| o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
o 0: 'A'
$ hg manifest
...
...
@@ -149,8 +172,9 @@
B
C
D
E
F
H
$ cd ..
...
...
@@ -153,10 +177,10 @@
$ cd ..
Rebasing C onto
E
detaching from B and collapsing:
Rebasing C onto
H
detaching from B and collapsing:
$ hg clone -q -u . a a4
$ cd a4
$ hg tglog
...
...
@@ -158,7 +182,7 @@
$ hg clone -q -u . a a4
$ cd a4
$ hg tglog
@
4
: '
E
'
@
7
: '
H
'
|
...
...
@@ -164,4 +188,10 @@
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
...
...
@@ -170,7 +200,7 @@
|/
o
0
:
'
A
'
$
hg
rebase
--
detach
--
collapse
-
s 2 -d
4
$
hg
rebase
--
detach
--
collapse
-
s 2 -d
7
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
...
...
@@ -174,6 +204,6 @@
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@
3
: 'Collapsed revision
@
6
: 'Collapsed revision
| * C
| * D'
...
...
@@ -178,4 +208,4 @@
| * C
| * D'
o
2
: '
E
'
o
5
: '
H
'
|
...
...
@@ -181,4 +211,10 @@
|
| o 4: 'G'
|/|
o | 3: 'F'
| |
| o 2: 'E'
|/
| o 1: 'B'
|/
o 0: 'A'
...
...
@@ -187,7 +223,8 @@
A
C
D
E
F
H
$ cd ..
...
...
@@ -204,5 +241,5 @@
created new head
$ hg tglog
@
5
: 'extra branch'
@
8
: 'extra branch'
...
...
@@ -208,3 +245,3 @@
o
4
: '
E
'
o
7
: '
H
'
|
...
...
@@ -210,4 +247,10 @@
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2
:
'
C
'
...
...
@@ -220,5 +263,5 @@
saved
backup
bundle
to
$TESTTMP
/a5/
.
hg
/strip-backup/
*-
backup
.
hg
(
glob
)
$
hg
tglog
@
5
:
'
D
'
@
8
:
'
D
'
|
...
...
@@ -224,3 +267,5 @@
|
o
4
:
'
C
'
o
7
:
'
C
'
|
o
6
:
'
B
'
|
...
...
@@ -226,3 +271,5 @@
|
o
3
:
'
B
'
o
5
:
'
extra branch
'
o
4
:
'
H
'
|
...
...
@@ -228,7 +275,9 @@
|
o
2
:
'
extra branch
'
o
1
:
'
E
'
|
|
o
3
:
'
G
'
|/|
o
|
2
:
'
F
'
|
|
|
o
1
:
'
E
'
|/
o
0
:
'
A
'
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