Mercurial > hg-allpaths
comparison tests/facing_problems.t @ 51:14a3ffbba22b
Fixing tests for older mercurials
author | Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl> |
---|---|
date | Sun, 25 Sep 2016 22:12:17 +0200 |
parents | 2d6c7e0c1b2f |
children | 6506ac4ef783 |
comparison
equal
deleted
inserted
replaced
50:55469dbb19c4 | 51:14a3ffbba22b |
---|---|
68 pushing to */unrelated (glob) | 68 pushing to */unrelated (glob) |
69 searching for changes | 69 searching for changes |
70 abort: repository is unrelated | 70 abort: repository is unrelated |
71 [255] | 71 [255] |
72 | 72 |
73 $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' | 73 $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n' |
74 0: First | 74 0: First |
75 | 75 |
76 $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' | 76 $ hg --cwd $GOOD2 log --template '{rev}: {desc}\n' |
77 | 77 |
78 $ hg --cwd $UNREL log -T '{rev}: {desc}\n' | 78 $ hg --cwd $UNREL log --template '{rev}: {desc}\n' |
79 0: Unrelated | 79 0: Unrelated |
80 | 80 |
81 and again, but in non-breaking mode | 81 and again, but in non-breaking mode |
82 | 82 |
83 $ cat >> $BASE/file.txt << EOF | 83 $ cat >> $BASE/file.txt << EOF |
104 adding changesets | 104 adding changesets |
105 adding manifests | 105 adding manifests |
106 adding file changes | 106 adding file changes |
107 added 2 changesets with 2 changes to 1 files | 107 added 2 changesets with 2 changes to 1 files |
108 | 108 |
109 $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' | 109 $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n' |
110 1: Second | 110 1: Second |
111 0: First | 111 0: First |
112 | 112 |
113 $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' | 113 $ hg --cwd $GOOD2 log --template '{rev}: {desc}\n' |
114 1: Second | 114 1: Second |
115 0: First | 115 0: First |
116 | 116 |
117 $ hg --cwd $UNREL log -T '{rev}: {desc}\n' | 117 $ hg --cwd $UNREL log --template '{rev}: {desc}\n' |
118 0: Unrelated | 118 0: Unrelated |
119 | 119 |
120 Let's also test pulling | 120 Let's also test pulling |
121 | 121 |
122 $ hg --cwd $GOOD1 update | 122 $ hg --cwd $GOOD1 update |
196 pulling from */unrelated (glob) | 196 pulling from */unrelated (glob) |
197 searching for changes | 197 searching for changes |
198 abort: repository is unrelated | 198 abort: repository is unrelated |
199 [255] | 199 [255] |
200 | 200 |
201 $ hg --cwd $BASE log -T '{rev}: {desc}\n' | 201 $ hg --cwd $BASE log --template '{rev}: {desc}\n' |
202 2: In repo1 | 202 2: In repo1 |
203 1: Second | 203 1: Second |
204 0: First | 204 0: First |
205 | 205 |
206 $ hg --cwd $BASE pullall --ignore-errors | 206 $ hg --cwd $BASE pullall --ignore-errors |
221 adding manifests | 221 adding manifests |
222 adding file changes | 222 adding file changes |
223 added 1 changesets with 0 changes to 1 files (+1 heads) | 223 added 1 changesets with 0 changes to 1 files (+1 heads) |
224 (run 'hg heads' to see heads, 'hg merge' to merge) | 224 (run 'hg heads' to see heads, 'hg merge' to merge) |
225 | 225 |
226 $ hg --cwd $BASE log -T '{rev}: {desc}\n' | 226 $ hg --cwd $BASE log --template '{rev}: {desc}\n' |
227 3: In good2 | 227 3: In good2 |
228 2: In repo1 | 228 2: In repo1 |
229 1: Second | 229 1: Second |
230 0: First | 230 0: First |
231 | 231 |