Mercurial > hg

comparison tests/test-bookmarks-rebase.t @ 49621:55c6ebd11cb9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: run many tests in $TESTTMP/repo instead of $TESTTMP This is useful so we can store other files in $TESTTMP (in particular tests that use docket files (nodemap, dirstate-v2) keep file uids in $TESTTMP/UID)
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Fri, 18 Nov 2022 13:47:29 +0000
parents 21733e8c924f
children
comparison
equal deleted inserted replaced
49620:8cd39c20445e 49621:55c6ebd11cb9
1 $ echo "[extensions]" >> $HGRCPATH 1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "rebase=" >> $HGRCPATH 2 $ echo "rebase=" >> $HGRCPATH
3 3
4 initialize repository 4 initialize repository
5 5
6 $ hg init 6 $ hg init repo
7 $ cd repo
7 8
8 $ echo 'a' > a 9 $ echo 'a' > a
9 $ hg ci -A -m "0" 10 $ hg ci -A -m "0"
10 adding a 11 adding a
11 12
36 37
37 rebase 38 rebase
38 39
39 $ hg rebase -s two -d one 40 $ hg rebase -s two -d one
40 rebasing 3:2ae46b1d99a7 two tip "3" 41 rebasing 3:2ae46b1d99a7 two tip "3"
41 saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg 42 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
42 43
43 $ hg log 44 $ hg log
44 changeset: 3:42e5ed2cdcf4 45 changeset: 3:42e5ed2cdcf4
45 bookmark: two 46 bookmark: two
46 tag: tip 47 tag: tip