Mercurial > hg
comparison tests/test-mq.out @ 5294:e14118f92730
mq: fix regression in 6fd953d5faea
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Mon, 10 Sep 2007 15:00:05 -0700 |
| parents | 06154aff2b1a |
| children | 61c230f81068 |
comparison
equal
deleted
inserted
replaced
| 5290:05889b6b1468 | 5294:e14118f92730 |
|---|---|
| 358 --- /dev/null | 358 --- /dev/null |
| 359 +++ b/fred | 359 +++ b/fred |
| 360 @@ -0,0 +1,1 @@ | 360 @@ -0,0 +1,1 @@ |
| 361 +bar | 361 +bar |
| 362 3 barney (foo) | 362 3 barney (foo) |
| 363 % refresh omitting an added file | |
| 364 C newfile | |
| 365 A newfile | |
| 366 Now at: bar | |
| 363 % create a git patch | 367 % create a git patch |
| 364 diff --git a/alexander b/alexander | 368 diff --git a/alexander b/alexander |
| 365 % create a git binary patch | 369 % create a git binary patch |
| 366 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus | 370 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
| 367 diff --git a/bucephalus b/bucephalus | 371 diff --git a/bucephalus b/bucephalus |