Mercurial > hg-stable

comparison tests/test-rebase-bookmarks.t @ 17345:4f8054d3171b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: fix check for trailing whitespace on sh command lines The $ has been without necessary escaping since introduced in c7d23b4ca4ba.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 08 Aug 2012 18:10:16 +0200
parents fba17a64fa49
children 2944a6d35158
comparison
equal deleted inserted replaced
17344:539d948d8d4b 17345:4f8054d3171b
36 adding d 36 adding d
37 created new head 37 created new head
38 38
39 $ hg book W 39 $ hg book W
40 40
41 $ hg tglog 41 $ hg tglog
42 @ 3: 'D' bookmarks: W 42 @ 3: 'D' bookmarks: W
43 | 43 |
44 | o 2: 'C' bookmarks: Y Z 44 | o 2: 'C' bookmarks: Y Z
45 | | 45 | |
46 | o 1: 'B' bookmarks: X 46 | o 1: 'B' bookmarks: X
57 $ hg up -q Z 57 $ hg up -q Z
58 58
59 $ hg rebase -s Y -d 3 59 $ hg rebase -s Y -d 3
60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) 60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
61 61
62 $ hg tglog 62 $ hg tglog
63 @ 3: 'C' bookmarks: Y Z 63 @ 3: 'C' bookmarks: Y Z
64 | 64 |
65 o 2: 'D' bookmarks: W 65 o 2: 'D' bookmarks: W
66 | 66 |
67 | o 1: 'B' bookmarks: X 67 | o 1: 'B' bookmarks: X
77 $ hg up -q Z 77 $ hg up -q Z
78 78
79 $ hg rebase -s 1 -d 3 79 $ hg rebase -s 1 -d 3
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) 80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
81 81
82 $ hg tglog 82 $ hg tglog
83 @ 3: 'C' bookmarks: Y Z 83 @ 3: 'C' bookmarks: Y Z
84 | 84 |
85 o 2: 'B' bookmarks: X 85 o 2: 'B' bookmarks: X
86 | 86 |
87 o 1: 'D' bookmarks: W 87 o 1: 'D' bookmarks: W