##// END OF EJS Templates
rebase: choose default destination the same way as 'hg merge' (BC)...
rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

File last commit:

r27576:6cd30449 default
r28189:fac3a24b default
Show More
test-lrucachedict.py.out
62 lines | 913 B | text/plain | TextLexer
/ tests / test-lrucachedict.py.out
Siddharth Agarwal
util: add an LRU cache dict...
r18603 'a' in d: True
d['a']: va
'b' in d: True
d['b']: vb
'c' in d: True
d['c']: vc
'd' in d: True
d['d']: vd
'a' in d: False
'b' in d: True
d['b']: vb
'c' in d: True
d['c']: vc
'd' in d: True
d['d']: vd
'e' in d: True
d['e']: ve
'b' in d: True
d['b']: vb2
'c' in d: True
d['c']: vc2
'd' in d: True
d['d']: vd
'e' in d: False
'f' in d: True
d['f']: vf
Siddharth Agarwal
lrucachedict: implement clear()
r19710 'b' in d: False
'c' in d: False
'd' in d: False
'e' in d: False
'f' in d: False
Gregory Szorc
util: reimplement lrucachedict...
r27371 'a' in d: True
d['a']: 1
'b' in d: True
d['b']: 2
Eric Sumner
lrucachedict: add copy method...
r27576
All of these should be present:
'a' in dc: True
dc['a']: va3
'b' in dc: True
dc['b']: vb3
'c' in dc: True
dc['c']: vc3
'd' in dc: True
dc['d']: vd3
All of these except 'a' should be present:
'a' in dc: False
'b' in dc: True
dc['b']: vb3
'c' in dc: True
dc['c']: vc3
'd' in dc: True
dc['d']: vd3
'e' in dc: True
dc['e']: ve3
These should be in reverse alphabetical order and read 'v?3':
d['d']: vd3
d['c']: vc3
d['b']: vb3
d['a']: va3