##// 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:

r25472:4d2b9b30 default
r28189:fac3a24b default
Show More
test-mq-symlinks.t
111 lines | 1.7 KiB | text/troff | Tads3Lexer
/ tests / test-mq-symlinks.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require symlink
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg init
$ hg qinit
$ hg qnew base.patch
$ echo aaa > a
$ echo bbb > b
$ echo ccc > c
$ hg add a b c
$ hg qrefresh
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> a not a symlink
test replacing a file with a symlink
$ hg qnew symlink.patch
$ rm a
$ ln -s b a
$ hg qrefresh --git
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> b
$ hg qpop
popping symlink.patch
now at: base.patch
$ hg qpush
applying symlink.patch
now at: symlink.patch
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> b
test updating a symlink
$ rm a
$ ln -s c a
$ hg qnew --git -f updatelink
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> c
$ hg qpop
popping updatelink
now at: symlink.patch
$ hg qpush --debug
applying updatelink
patching file a
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 committing files:
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 committing manifest
committing changelog
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 now at: updatelink
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> c
$ hg st
test replacing a symlink with a file
$ ln -s c s
$ hg add s
$ hg qnew --git -f addlink
$ rm s
$ echo sss > s
$ hg qnew --git -f replacelinkwithfile
$ hg qpop
popping replacelinkwithfile
now at: addlink
$ hg qpush
applying replacelinkwithfile
now at: replacelinkwithfile
$ cat s
sss
$ hg st
test symlink removal
$ hg qnew removesl.patch
$ hg rm a
$ hg qrefresh --git
$ hg qpop
popping removesl.patch
now at: replacelinkwithfile
$ hg qpush
applying removesl.patch
now at: removesl.patch
$ hg st -c
C b
C c
C s
Patrick Mezard
Merge with stable
r12345
replace broken symlink with another broken symlink
$ ln -s linka linka
$ hg add linka
$ hg qnew link
$ hg mv linka linkb
Mads Kiilerich
merge with stable
r12398 $ rm linkb
$ ln -s linkb linkb
Patrick Mezard
Merge with stable
r12345 $ hg qnew movelink
$ hg qpop
popping movelink
now at: link
$ hg qpush
applying movelink
now at: movelink
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 $ readlink.py linkb
Patrick Mezard
Merge with stable
r12345 linkb -> linkb