mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
22e5d8d701
If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.
24 lines
436 B
Perl
24 lines
436 B
Perl
Test issue2761
|
|
|
|
$ hg init
|
|
|
|
$ touch to-be-deleted
|
|
$ hg add
|
|
adding to-be-deleted
|
|
$ hg ci -m first
|
|
$ echo a > to-be-deleted
|
|
$ hg ci -m second
|
|
$ rm to-be-deleted
|
|
$ hg diff -r 0
|
|
|
|
Same issue, different code path
|
|
|
|
$ hg up -C
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ touch doesnt-exist-in-1
|
|
$ hg add
|
|
adding doesnt-exist-in-1
|
|
$ hg ci -m third
|
|
$ rm doesnt-exist-in-1
|
|
$ hg diff -r 1
|