mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
7fa918cefd
Summary: Also change the internal API so it no longer accepts the "heads" argument. Reviewed By: ryanmce Differential Revision: D6745865 fbshipit-source-id: 368742be49b192f7630421003552d0a10eb0b76d
69 lines
1.4 KiB
Perl
69 lines
1.4 KiB
Perl
$ cat <<EOF >> $HGRCPATH
|
|
> [extensions]
|
|
> purge =
|
|
> EOF
|
|
|
|
$ hg init test
|
|
$ cd test
|
|
$ echo a > changed
|
|
$ echo a > removed
|
|
$ echo a > source
|
|
$ hg ci -Am addfiles
|
|
adding changed
|
|
adding removed
|
|
adding source
|
|
$ echo a >> changed
|
|
$ echo a > added
|
|
$ hg add added
|
|
$ hg rm removed
|
|
$ hg cp source copied
|
|
$ hg diff --git > ../unknown.diff
|
|
|
|
Test adding on top of an unknown file
|
|
|
|
$ hg up -qC 0
|
|
$ hg purge
|
|
$ echo a > added
|
|
$ hg import --no-commit ../unknown.diff
|
|
applying ../unknown.diff
|
|
file added already exists
|
|
1 out of 1 hunks FAILED -- saving rejects to file added.rej
|
|
abort: patch failed to apply
|
|
[255]
|
|
|
|
Test modifying an unknown file
|
|
|
|
$ hg revert -aq
|
|
$ hg purge
|
|
$ hg rm changed
|
|
$ hg ci -m removechanged
|
|
$ echo a > changed
|
|
$ hg import --no-commit ../unknown.diff
|
|
applying ../unknown.diff
|
|
abort: cannot patch changed: file is not tracked
|
|
[255]
|
|
|
|
Test removing an unknown file
|
|
|
|
$ hg up -qC 0
|
|
$ hg purge
|
|
$ hg rm removed
|
|
$ hg ci -m removeremoved
|
|
$ echo a > removed
|
|
$ hg import --no-commit ../unknown.diff
|
|
applying ../unknown.diff
|
|
abort: cannot patch removed: file is not tracked
|
|
[255]
|
|
|
|
Test copying onto an unknown file
|
|
|
|
$ hg up -qC 0
|
|
$ hg purge
|
|
$ echo a > copied
|
|
$ hg import --no-commit ../unknown.diff
|
|
applying ../unknown.diff
|
|
abort: cannot create copied: destination already exists
|
|
[255]
|
|
|
|
$ cd ..
|