Mercurial > hg

comparison tests/test-rebase-pull.t @ 15937:7ed056f1e97d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 2.1 code freeze
author Matt Mackall <mpm@selenic.com>
date Thu, 19 Jan 2012 14:34:32 -0600
parents 9910f60a37ee
children 5b41d5ad52bf
comparison
equal deleted inserted replaced
15900:29defa7d20f6 15937:7ed056f1e97d
46 $ cd ../b 46 $ cd ../b
47 47
48 Now b has one revision to be pulled from a: 48 Now b has one revision to be pulled from a:
49 49
50 $ hg pull --rebase 50 $ hg pull --rebase
51 pulling from $TESTTMP/a 51 pulling from $TESTTMP/a (glob)
52 searching for changes 52 searching for changes
53 adding changesets 53 adding changesets
54 adding manifests 54 adding manifests
55 adding file changes 55 adding file changes
56 added 1 changesets with 1 changes to 1 files (+1 heads) 56 added 1 changesets with 1 changes to 1 files (+1 heads)
66 o 0: 'C1' 66 o 0: 'C1'
67 67
68 Re-run: 68 Re-run:
69 69
70 $ hg pull --rebase 70 $ hg pull --rebase
71 pulling from $TESTTMP/a 71 pulling from $TESTTMP/a (glob)
72 searching for changes 72 searching for changes
73 no changes found 73 no changes found
74 74
75 75
76 Invoke pull --rebase and nothing to rebase: 76 Invoke pull --rebase and nothing to rebase:
77 77
78 $ cd ../c 78 $ cd ../c
79 79
80 $ hg pull --rebase 80 $ hg pull --rebase
81 pulling from $TESTTMP/a 81 pulling from $TESTTMP/a (glob)
82 searching for changes 82 searching for changes
83 adding changesets 83 adding changesets
84 adding manifests 84 adding manifests
85 adding file changes 85 adding file changes
86 added 1 changesets with 1 changes to 1 files 86 added 1 changesets with 1 changes to 1 files
92 | 92 |
93 93
94 pull --rebase --update should ignore --update: 94 pull --rebase --update should ignore --update:
95 95
96 $ hg pull --rebase --update 96 $ hg pull --rebase --update
97 pulling from $TESTTMP/a 97 pulling from $TESTTMP/a (glob)
98 searching for changes 98 searching for changes
99 no changes found 99 no changes found
100 100
101 pull --rebase doesn't update if nothing has been pulled: 101 pull --rebase doesn't update if nothing has been pulled:
102 102
103 $ hg up -q 1 103 $ hg up -q 1
104 104
105 $ hg pull --rebase 105 $ hg pull --rebase
106 pulling from $TESTTMP/a 106 pulling from $TESTTMP/a (glob)
107 searching for changes 107 searching for changes
108 no changes found 108 no changes found
109 109
110 $ hg tglog -l 1 110 $ hg tglog -l 1
111 o 2: 'R1' 111 o 2: 'R1'