454 |
454 |
455 Corner case of amend from issue6157: |
455 Corner case of amend from issue6157: |
456 - working copy parent has a change to file `a` |
456 - working copy parent has a change to file `a` |
457 - working copy has the inverse change |
457 - working copy has the inverse change |
458 - we amend the working copy parent for files other than `a` |
458 - we amend the working copy parent for files other than `a` |
459 hg includes the changes to `a` anyway. |
459 hg used to include the changes to `a` anyway. |
460 |
460 |
461 $ hg init 6157; cd 6157 |
461 $ hg init 6157; cd 6157 |
462 $ echo a > a; echo b > b; hg commit -qAm_ |
462 $ echo a > a; echo b > b; hg commit -qAm_ |
463 $ echo a2 > a; hg commit -qm_ |
463 $ echo a2 > a; hg commit -qm_ |
464 $ hg diff --stat -c . |
464 $ hg diff --stat -c . |
465 a | 2 +- |
465 a | 2 +- |
466 1 files changed, 1 insertions(+), 1 deletions(-) |
466 1 files changed, 1 insertions(+), 1 deletions(-) |
467 $ echo a > a; echo b2 > b; hg amend -q b |
467 $ echo a > a; echo b2 > b; hg amend -q b |
468 $ hg diff --stat -c . |
468 $ hg diff --stat -c . |
|
469 a | 2 +- |
469 b | 2 +- |
470 b | 2 +- |
470 1 files changed, 1 insertions(+), 1 deletions(-) |
471 2 files changed, 2 insertions(+), 2 deletions(-) |