diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-07-09 07:26:21 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-07-09 07:26:21 +0000 |
| commit | e7bb642fdbcfa9bb1d7265781f56d89e398f90b9 (patch) | |
| tree | 1ad9d16ce37e504ba72f9315c94ca9eb95597133 /test/comments.test | |
| parent | c871d820f8f00819613068aa77cb00d89e4508af (diff) | |
| download | quilt-e7bb642fdbcfa9bb1d7265781f56d89e398f90b9.tar.gz | |
- Switch from echo to printf for all translations: This is more
stable than having expansions in messages that might change
independent of the message.
- Add print_patch function and always use it when printing patch
names. Remove -n options from various scripts and use a global
switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch
names with and without directory prefix. Depending on user
experience this switch may eventually go away.
- Add --diffstat option to refresh command: If given, this option
inserts diffstat statistics at the end of the patch header, or
refreshes the existing diffstat output. No special tags in the
path file (%diffstat or the like) are needed.
- Minor fix inserting changelog into RPM specfile.
Diffstat (limited to 'test/comments.test')
| -rw-r--r-- | test/comments.test | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/test/comments.test b/test/comments.test index 680414b..0918443 100644 --- a/test/comments.test +++ b/test/comments.test @@ -12,8 +12,8 @@ accidentally removed. < < Index: f < =================================================================== - < --- f.orig 2003-04-09 03:18:06.000000000 +0200 - < +++ f 2003-04-09 03:18:09.000000000 +0200 + < --- f.orig foo + < +++ f bar < @@ -1 +1 @@ < -one < +two @@ -22,14 +22,14 @@ accidentally removed. < test.diff -p0 $ quilt push - > Applying test.diff + > Applying patch %{P}test.diff > patching file f > - > Now at patch test.diff + > Now at patch %{P}test.diff $ quilt refresh - > Refreshed patch test.diff - $ sed -e "s/\\t.*//" patches/test.diff + > Refreshed patch %{P}test.diff + $ cat patches/test.diff > C1 > > C3 @@ -42,6 +42,39 @@ accidentally removed. > -one > +two + $ quilt refresh -c + > Refreshed patch %{P}test.diff + + $ cat patches/test.diff + > C1 + > + > C3 + > + > Index: f + > =================================================================== + > *** f.orig + > --- f + > *************** + > *** 1 **** + > ! one + > --- 1 ---- + > ! two + + $ quilt refresh + > Refreshed patch %{P}test.diff + + $ cat patches/test.diff + > C1 + > + > C3 + > + > Index: f + > =================================================================== + > --- f.orig + > +++ f + > @@ -1 +1 @@ + > -one + > +two $ cd .. $ rm -rf d |