##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: ensure platform independent revision hashes in test-notify.t...
tests: ensure platform independent revision hashes in test-notify.t Makes the test pass again on windows after ca572e94d8e7.
Pierre-Yves David - - Load All Authors

File last commit:

r15742:65df60a3 default
r15767:d85ecaf3 default
Show More
test-rebase-interruptions.t
197 lines | 2.7 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-interruptions.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-rebase*
 r12608 $ cat >> $HGRCPATH <<EOF
> [extensions]
> graphlog=
> rebase=
>
Pierre-Yves David
phases: prevent rebase to rebase immutable changeset.
 r15742 > [phases]
> publish=False
>
Adrian Buehlmann
tests: unify test-rebase*
 r12608 > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
> EOF
$ 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 >> A
$ hg ci -m C
$ hg up -q -C 0
$ echo D >> A
$ hg ci -m D
created new head
$ echo E > E
$ hg ci -Am E
adding E
$ cd ..
Changes during an interruption - continue:
$ hg clone -q -u . a a1
$ cd a1
$ hg tglog
@ 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Rebasing B onto E:
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Steve Borho
rebase: improve resolve failure message
 r12896 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Force a commit on C during the interruption:
$ hg up -q -C 2
$ echo 'Extra' > Extra
$ hg add Extra
$ hg ci -m 'Extra'
$ hg tglog
@ 6: 'Extra'
|
| o 5: 'B'
| |
| o 4: 'E'
| |
| o 3: 'D'
| |
o | 2: 'C'
| |
o | 1: 'B'
|/
o 0: 'A'
Resume the rebasing:
$ hg rebase --continue
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Steve Borho
rebase: improve resolve failure message
 r12896 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Solve the conflict and go on:
$ echo 'conflict solved' > A
$ rm A.orig
$ hg resolve -m A
$ hg rebase --continue
warning: new changesets detected on source branch, not stripping
$ hg tglog
@ 7: 'C'
|
| o 6: 'Extra'
| |
o | 5: 'B'
| |
o | 4: 'E'
| |
o | 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ cd ..
Changes during an interruption - abort:
$ hg clone -q -u . a a2
$ cd a2
$ hg tglog
@ 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Rebasing B onto E:
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Steve Borho
rebase: improve resolve failure message
 r12896 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Force a commit on B' during the interruption:
$ hg up -q -C 5
$ echo 'Extra' > Extra
$ hg add Extra
$ hg ci -m 'Extra'
$ hg tglog
@ 6: 'Extra'
|
o 5: 'B'
|
o 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Abort the rebasing:
$ hg rebase --abort
warning: new changesets detected on target branch, can't abort
[255]
$ hg tglog
@ 6: 'Extra'
|
o 5: 'B'
|
o 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ cd ..