annotate tests/test-issue322.out @ 4900:e56c7e05c7e6
patch.py: re-add the ability to use an external patch program
This is now invoked by default only if ui.patch is set. Otherwise, we
use our built-in patch. If that fails because it can't find any valid
hunks, we'll fall back to trying the external patch command.
author |
Bryan O'Sullivan <bos@serpentine.com> |
date |
Tue, 17 Jul 2007 09:39:30 -0700 |
parents |
3d5547845158 |
children |
e3dffbdc6522 |
rev |
line source |
2953
|
1 % file replaced with directory
|
|
2 adding a
|
|
3 % should fail - would corrupt dirstate
|
|
4 abort: file named 'a' already in dirstate
|
|
5 % directory replaced with file
|
|
6 adding a/a
|
|
7 % should fail - would corrupt dirstate
|
|
8 abort: directory named 'a' already in dirstate
|
|
9 % directory replaced with file
|
|
10 adding b/c/d
|
|
11 % should fail - would corrupt dirstate
|
|
12 abort: directory named 'b' already in dirstate
|