Mercurial > hg
comparison tests/test-mq-qrefresh.out @ 10368:f05e0d54f424
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 07 Feb 2010 14:43:21 +0100 |
| parents | b8801b58bbd8 |
| children | 8cb81d75730c |
comparison
equal
deleted
inserted
replaced
| 10365:d757bc0c7865 | 10368:f05e0d54f424 |
|---|---|
| 257 diff -r 000000000000 b | 257 diff -r 000000000000 b |
| 258 --- /dev/null | 258 --- /dev/null |
| 259 +++ b/b | 259 +++ b/b |
| 260 @@ -0,0 +1,1 @@ | 260 @@ -0,0 +1,1 @@ |
| 261 +a | 261 +a |
| 262 % issue2025: qrefresh does not honor filtering options when tip != qtip | |
| 263 % refresh with tip != qtip | |
| 264 saving bundle... | |
| 265 adding branch | |
| 266 adding changesets | |
| 267 adding manifests | |
| 268 adding file changes | |
| 269 added 1 changesets with 1 changes to 1 files | |
| 270 % status after refresh | |
| 271 M a | |
| 272 % b after refresh | |
| 273 b | |
| 274 b | |
| 275 % patch file after refresh | |
| 276 diff -r 1a60229be7ac b | |
| 277 --- a/b | |
| 278 +++ b/b | |
| 279 @@ -1,1 +1,2 @@ | |
| 280 b | |
| 281 +b | |
| 262 % issue1441 with git patches | 282 % issue1441 with git patches |
| 263 diff --git a/b b/b | 283 diff --git a/b b/b |
| 264 new file mode 100644 | 284 new file mode 100644 |
| 265 --- /dev/null | 285 --- /dev/null |
| 266 +++ b/b | 286 +++ b/b |