##// END OF EJS Templates
py3: handle keyword arguments correctly in hgext/patchbomb.py...
py3: handle keyword arguments correctly in hgext/patchbomb.py The keys of keyword arguments must be str on Python 3 which is unicode. This patch make sure we pass keyword arguments with keys are str everywhere in this file and access the keys depending on whether they are bytes or str. This patch uses pycompat.{byteskwargs|strkwargs} and somewhere it also added r'' to prevent transformer from adding a b'' over there. Differential Revision: https://phab.mercurial-scm.org/D974

File last commit:

r28065:6b1fc09c default
r35035:71e63fe6 default
Show More
test-merge5.t
36 lines | 837 B | text/troff | Tads3Lexer
Pradeepkumar Gayam
tests: unify test-merge5
r11978 $ hg init
$ echo This is file a1 > a
$ echo This is file b1 > b
$ hg add a b
Martin Geisler
test-merge5: removed unnecessary parts of test...
r12155 $ hg commit -m "commit #0"
Pradeepkumar Gayam
tests: unify test-merge5
r11978 $ echo This is file b22 > b
Martin Geisler
test-merge5: removed unnecessary parts of test...
r12155 $ hg commit -m "comment #1"
Pradeepkumar Gayam
tests: unify test-merge5
r11978 $ hg update 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm b
Martin Geisler
test-merge5: removed unnecessary parts of test...
r12155 $ hg commit -A -m "comment #2"
Pradeepkumar Gayam
tests: unify test-merge5
r11978 removing b
created new head
Brodie Rao
test-merge5: ensure updating to tip across branches is tested...
r12154 $ hg update 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
update: check for missing files with --check (issue3595)
r17849 $ rm b
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
r28065 $ hg update -c 2
Siddharth Agarwal
update: standardize error message for dirty update --check...
r19801 abort: uncommitted changes
Matt Mackall
update: check for missing files with --check (issue3595)
r17849 [255]
$ hg revert b
Pierre-Yves David
update: change default destination to tipmost descendant (issue4673) (BC)...
r28065 $ hg update -c 2
Brodie Rao
test-merge5: ensure updating to tip across branches is tested...
r12154 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Pradeepkumar Gayam
tests: unify test-merge5
r11978 $ mv a c
Martin Geisler
test-merge5: removed unnecessary parts of test...
r12155 Should abort:
Martin von Zweigbergk
test-merge5: remove obsolete '-y' and its motivating comment...
r23026 $ hg update 1
Siddharth Agarwal
update: add error message for dirty non-linear update with no rev...
r19799 abort: uncommitted changes
(commit or update --clean to discard changes)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Pradeepkumar Gayam
tests: unify test-merge5
r11978 $ mv c a
Martin Geisler
test-merge5: removed unnecessary parts of test...
r12155
Should succeed:
Martin von Zweigbergk
test-merge5: remove obsolete '-y' and its motivating comment...
r23026 $ hg update 1
Pradeepkumar Gayam
tests: unify test-merge5
r11978 1 files updated, 0 files merged, 0 files removed, 0 files unresolved