Mercurial > hg

comparison tests/test-rebase-rename.t @ 12640:6cc4b14fb76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 08 Oct 2010 22:36:10 -0500
parents 16b854cb80f1
children 46c3043253fb
comparison
equal deleted inserted replaced
12639:236058a65cb4 12640:6cc4b14fb76b
44 rename to a-renamed 44 rename to a-renamed
45 45
46 Rebase the revision containing the rename: 46 Rebase the revision containing the rename:
47 47
48 $ hg rebase -s 2 -d 1 48 $ hg rebase -s 2 -d 1
49 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) 49 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
50 50
51 $ hg tglog 51 $ hg tglog
52 @ 2: 'rename A' 52 @ 2: 'rename A'
53 | 53 |
54 o 1: 'B' 54 o 1: 'B'
100 copy to a-copied 100 copy to a-copied
101 101
102 Rebase the revision containing the copy: 102 Rebase the revision containing the copy:
103 103
104 $ hg rebase -s 2 -d 1 104 $ hg rebase -s 2 -d 1
105 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) 105 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
106 106
107 $ hg tglog 107 $ hg tglog
108 @ 2: 'copy A' 108 @ 2: 'copy A'
109 | 109 |
110 o 1: 'B' 110 o 1: 'B'