##// END OF EJS Templates
errors: name arguments to UnknownCommand constructor...
errors: name arguments to UnknownCommand constructor Differential Revision: https://phab.mercurial-scm.org/D9166

File last commit:

r45710:dc5e5577 default
r46272:bb1a988e default
Show More
test-rebase-backup.t
150 lines | 2.6 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-backup.t
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 $ cat << EOF >> $HGRCPATH
> [extensions]
> rebase=
> EOF
Yuya Nishihara
repair: move ui.history-editing-backup to [rewrite] section...
r41242 ==================================
Test backup-bundle config option |
==================================
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 Test with Pre-obsmarker rebase:
1) When config option is not set:
$ hg init repo1
$ cd repo1
$ echo a>a
$ hg ci -qAma
$ echo b>b
$ hg ci -qAmb
$ echo c>c
$ hg ci -qAmc
$ hg up 0 -q
$ echo d>d
$ hg ci -qAmd
$ echo e>e
$ hg ci -qAme
$ hg log -GT "{rev}: {firstline(desc)}\n"
@ 4: e
|
o 3: d
|
| o 2: c
| |
| o 1: b
|/
o 0: a
$ hg rebase -s 1 -d .
rebasing 1:d2ae7f538514 "b"
rebasing 2:177f92b77385 "c"
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/d2ae7f538514-c7ed7a78-rebase.hg
$ hg log -GT "{rev}: {firstline(desc)}\n"
o 4: c
|
o 3: b
|
@ 2: e
|
o 1: d
|
o 0: a
2) When config option is set:
$ cat << EOF >> $HGRCPATH
Yuya Nishihara
repair: move ui.history-editing-backup to [rewrite] section...
r41242 > [rewrite]
> backup-bundle = False
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 > EOF
$ echo f>f
$ hg ci -Aqmf
$ echo g>g
$ hg ci -Aqmg
$ hg log -GT "{rev}: {firstline(desc)}\n"
@ 6: g
|
o 5: f
|
| o 4: c
| |
| o 3: b
|/
o 2: e
|
o 1: d
|
o 0: a
$ hg rebase -s 3 -d .
rebasing 3:05bff2a95b12 "b"
rebasing 4:1762bde4404d "c"
$ hg log -GT "{rev}: {firstline(desc)}\n"
o 6: c
|
o 5: b
|
@ 4: g
|
o 3: f
|
o 2: e
|
o 1: d
|
o 0: a
Test when rebased revisions are stripped during abort:
======================================================
$ echo conflict > c
$ hg ci -Am "conflict with c"
adding c
created new head
$ hg log -GT "{rev}: {firstline(desc)}\n"
@ 7: conflict with c
|
| o 6: c
| |
| o 5: b
|/
o 4: g
|
o 3: f
|
o 2: e
|
o 1: d
|
o 0: a
Yuya Nishihara
repair: move ui.history-editing-backup to [rewrite] section...
r41242 When backup-bundle = True:
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 $ cat << EOF >> $HGRCPATH
Yuya Nishihara
repair: move ui.history-editing-backup to [rewrite] section...
r41242 > [rewrite]
> backup-bundle = True
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 > EOF
$ hg rebase -s 5 -d .
rebasing 5:1f8148a544ee "b"
rebasing 6:f8bc7d28e573 "c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
Daniel Ploch
error: unify the error message formats for 'rebase' and 'unshelve'...
r45710 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 [1]
$ hg rebase --abort
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg
rebase aborted
Yuya Nishihara
repair: move ui.history-editing-backup to [rewrite] section...
r41242 When backup-bundle = False:
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 $ cat << EOF >> $HGRCPATH
Yuya Nishihara
repair: move ui.history-editing-backup to [rewrite] section...
r41242 > [rewrite]
> backup-bundle = False
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 > EOF
$ hg rebase -s 5 -d .
rebasing 5:1f8148a544ee "b"
rebasing 6:f8bc7d28e573 "c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
Daniel Ploch
error: unify the error message formats for 'rebase' and 'unshelve'...
r45710 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
Sushil khanchi
rebase: support "history-editing-backup" config option...
r38835 [1]
$ hg rebase --abort
rebase aborted
$ cd ..