summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt/revert.in1
-rw-r--r--test/nolink.test20
2 files changed, 20 insertions, 1 deletions
diff --git a/quilt/revert.in b/quilt/revert.in
index 14b651a..d65981c 100644
--- a/quilt/revert.in
+++ b/quilt/revert.in
@@ -104,7 +104,6 @@ do
fi
mkdir -p "$(dirname "$file")"
- ln -f "$workdir/$file" "$file" 2>&1 ||
cp -p "$workdir/$file" "$file"
else
if [ ! -e "$file" ]
diff --git a/test/nolink.test b/test/nolink.test
index d29b7c6..aa1efe0 100644
--- a/test/nolink.test
+++ b/test/nolink.test
@@ -2,6 +2,7 @@
$ mkdir -p d/patches
$ cd d
+# quilt should preserve hard links and not create new ones
$ echo foo > foo
$ ln foo foo2
$ ls -l foo | awk '{ print $2 }'
@@ -53,5 +54,24 @@
$ ls -l foo | awk '{ print $2 }'
> 2
+# quilt revert should not create hard links
+ $ echo bar > bar
+ $ quilt push -q
+ > Applying patch patches/test.diff
+ > Now at patch patches/test.diff
+
+ $ quilt add bar
+ > File bar added to patch patches/test.diff
+ $ echo "bar changed" > bar
+ $ quilt revert bar
+ > Changes to bar in patch patches/test.diff reverted
+
+ $ ls -l bar | awk '{ print $2 }'
+ > 1
+
+ $ quilt pop -q
+ > Removing patch patches/test.diff
+ > No patches applied
+
$ cd ..
$ rm -rf d