##// END OF EJS Templates
phases: on copy clone, do not copy phases data if repote is publishing
phases: on copy clone, do not copy phases data if repote is publishing

File last commit:

r15524:e7119b09 merge default
r15741:60344b83 default
Show More
test-rebase-detach.t
395 lines | 5.2 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-detach.t
Adrian Buehlmann
tests: unify test-rebase*
r12608 $ cat >> $HGRCPATH <<EOF
> [extensions]
> graphlog=
> rebase=
>
> [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
> EOF
$ hg init a
$ cd a
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 $ 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
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ cd ..
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 Rebasing D onto H detaching from C:
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg clone -q -u . a a1
$ cd a1
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 $ hg rebase --detach -s 3 -d 7
Mads Kiilerich
tests: remove redundant globs...
r12640 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'D'
|
o 6: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 5: 'G'
|/|
o | 4: 'F'
| |
| o 3: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg manifest
A
D
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 F
H
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ cd ..
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 Rebasing C onto H detaching from B:
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg clone -q -u . a a2
$ cd a2
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 $ hg rebase --detach -s 2 -d 7
Mads Kiilerich
tests: remove redundant globs...
r12640 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'D'
|
o 6: 'C'
|
o 5: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 4: 'G'
|/|
o | 3: 'F'
| |
| o 2: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 1: 'B'
|/
o 0: 'A'
$ hg manifest
A
C
D
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 F
H
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ cd ..
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 Rebasing B onto H using detach (same as not using it):
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg clone -q -u . a a3
$ cd a3
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 $ hg rebase --detach -s 1 -d 7
Mads Kiilerich
tests: remove redundant globs...
r12640 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'D'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 o 6: 'C'
|
o 5: 'B'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 o 4: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 o 0: 'A'
$ hg manifest
A
B
C
D
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 F
H
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ cd ..
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 Rebasing C onto H detaching from B and collapsing:
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg clone -q -u . a a4
$ cd a4
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 7: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 $ hg rebase --detach --collapse -s 2 -d 7
Mads Kiilerich
tests: remove redundant globs...
r12640 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 6: 'Collapsed revision
Adrian Buehlmann
tests: unify test-rebase*
r12608 | * C
| * D'
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 o 5: 'H'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 4: 'G'
|/|
o | 3: 'F'
| |
| o 2: 'E'
|/
Adrian Buehlmann
tests: unify test-rebase*
r12608 | o 1: 'B'
|/
o 0: 'A'
$ hg manifest
A
C
D
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 F
H
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ cd ..
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 Rebasing across null as ancestor
$ hg clone -q -U a a5
$ cd a5
$ echo x > x
$ hg add x
$ hg ci -m "extra branch"
created new head
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 8: 'extra branch'
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 o 7: 'H'
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 | o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase --detach -s 1 -d tip
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 @ 8: 'D'
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 o 7: 'C'
|
o 6: 'B'
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 o 5: 'extra branch'
o 4: 'H'
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 |
Nicolas Dumazet
tests: change test-rebase-detach to use bundle/rebase.hg
r14121 | o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
Henrik Stuart
rebase: support --detach when null is common ancestor
r13021 o 0: 'A'
Pierre-Yves David
rebase: allow rebase to ancestor (issue3010)...
r15132
$ hg rebase -d 5 -s 7
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
Pierre-Yves David
rebase: allow rebase to ancestor (issue3010)...
r15132 $ hg tglog
@ 8: 'D'
|
o 7: 'C'
|
| o 6: 'B'
|/
o 5: 'extra branch'
o 4: 'H'
|
| o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
o 0: 'A'
Stefano Tortarolo
rebase: treat nullmerge as a special case in rebasestate (issue3046)...
r15464 $ cd ..
Stefano Tortarolo
rebase: ensure target is not taken as external (issue3085)...
r15469 Verify that target is not selected as external rev (issue3085)
$ hg clone -q -U a a6
$ cd a6
$ hg up -q 6
$ echo "I" >> E
$ hg ci -m "I"
$ hg merge 7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "Merge"
$ echo "J" >> F
$ hg ci -m "J"
$ hg rebase -s 8 -d 7 --collapse --detach --config ui.merge=internal:other
remote changed E which local deleted
use (c)hanged version or leave (d)eleted? c
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 8: 'Collapsed revision
| * I
| * Merge
| * J'
o 7: 'H'
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg parents
changeset: 8:9472f4b1d736
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Collapsed revision
$ cd ..
Stefano Tortarolo
rebase: treat nullmerge as a special case in rebasestate (issue3046)...
r15464 Ensure --continue restores a correct state (issue3046):
Stefano Tortarolo
rebase: ensure target is not taken as external (issue3085)...
r15469 $ hg clone -q a a7
$ cd a7
Stefano Tortarolo
rebase: treat nullmerge as a special case in rebasestate (issue3046)...
r15464 $ hg up -q 3
$ echo 'H2' > H
$ hg ci -A -m 'H2'
adding H
$ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail
merging H
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
r15501 merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
Stefano Tortarolo
rebase: treat nullmerge as a special case in rebasestate (issue3046)...
r15464 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
$ hg resolve --all -t internal:local
$ hg rebase -c
Mads Kiilerich
tests: add missing '(glob)'s to match '\' in paths in test output on windows
r15520 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
Stefano Tortarolo
rebase: treat nullmerge as a special case in rebasestate (issue3046)...
r15464 $ hg tglog
@ 8: 'H2'
|
o 7: 'H'
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'