diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-03-21 15:57:13 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-03-21 15:57:13 +0000 |
| commit | 89ecf7e2648113efec3389e4dc3361d04bb45369 (patch) | |
| tree | 1b7c84d405d9668f2e9d9bff0c5829a8ddb94ffb | |
| parent | 25736803b5e7b232cdc04fd531765b8ec36e2c8a (diff) | |
| download | quilt-89ecf7e2648113efec3389e4dc3361d04bb45369.tar.gz | |
- quilt/edit.in: The last fix broke another way of using edit.
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/edit.in | 2 | ||||
| -rw-r--r-- | test/edit.test | 16 |
3 files changed, 21 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes index 398280f..8c82267 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 21 16:47:57 CET 2006 - agruen@suse.de + +- quilt/edit.in: The last fix broke another way of using edit. + +------------------------------------------------------------------- Mon Mar 20 20:16:42 CET 2006 - khali@linux-fr.org - configure.ac: Fix a typo in a test expression which was breaking diff --git a/quilt/edit.in b/quilt/edit.in index 6b48242..cc9af27 100644 --- a/quilt/edit.in +++ b/quilt/edit.in @@ -69,7 +69,7 @@ $EDITOR "${@/#/$SUBDIR}" status=$? for file in "$@" do - if ! [ -e "$SUBDIR/$file" ] + if ! [ -e "$SUBDIR$file" ] then quilt_command remove "$file" status=1 diff --git a/test/edit.test b/test/edit.test index 4c4c542..ee1c1f6 100644 --- a/test/edit.test +++ b/test/edit.test @@ -12,14 +12,28 @@ $ export EDITOR=%PWD/editor $ quilt new patch > Patch patches/patch is now on top + +$ echo foobar > foobar +$ quilt edit foobar +> File foobar added to patch patches/patch +> Editing foobar + $ cd subdir $ echo foo > foo $ quilt edit foo > File subdir/foo added to patch ../patches/patch > Editing subdir/foo -$ cat foo +$ cd .. +$ cat foobar +> barbar + +$ cat subdir/foo > bar +$ quilt files +> foobar +> subdir/foo + $ cd ../.. $ rm -rf d |