bugQuilt - Bugs: bug #53701, quilt pop reports "Patch...

 
 

bug #53701: quilt pop reports "Patch [...] needs to be refreshed first."

Submitted by:  Filipus Klutiero <chealer>
Submitted on:  Thu 19 Apr 2018 05:29:12 PM UTC  
 
Category:  None Severity:  3 - Normal
Item Group:  None Status:  None
Privacy:  Public Assigned to:  None
Open/Closed:  Open

Add a New Comment (Rich Markup)
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Thu 19 Apr 2018 05:29:12 PM UTC, original submission:  

The pop command can fail without indicating why. The verbose option does not help.

This happened after I manually applied a patch, manually marked it as applied by quilt (forcefully pushing), then tried unapplying it using Quilt. For example:

cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt new test.diff
Patch test.diff is now on top
cloph2@SWIKID02:/var/www/html/foncierpedia$ echo initial > pop.test
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt add pop.test
File pop.test added to patch test.diff
cloph2@SWIKID02:/var/www/html/foncierpedia$ echo final > pop.test
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt refresh
Refreshed patch test.diff
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt pop
Removing patch test.diff
Restoring pop.test

Now at patch WYSIWYG_fix_display.diff
cloph2@SWIKID02:/var/www/html/foncierpedia$ echo final > pop.test
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt push -f
Applying patch test.diff
patching file pop.test
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file pop.test.rej
Patch test.diff appears to be empty; applied
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt pop
Patch test.diff needs to be refreshed first.
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt pop -v
Patch test.diff needs to be refreshed first.
cloph2@SWIKID02:/var/www/html/foncierpedia$ quilt pop -f
Patch test.diff appears to be empty, removing

Now at patch WYSIWYG_fix_display.diff
cloph2@SWIKID02:/var/www/html/foncierpedia$ cat pop.test
final
cloph2@SWIKID02:/var/www/html/foncierpedia$

As far as I can see, in such a situation, the only way to unapply is to mark as unapplied using quilt pop -f, and then to manually unapply. Refreshing the patch does not help.

Filipus Klutiero <chealer>

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by chealer (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

     

     

    No changes have been made to this item

    Back to the top


    Powered by Savane 3.5