Turns out there is no hg qfold -a.
I tried hg qfold $(hg qunapp) and hg qunapp | xargs hg qfold but couldn't get it to work. Any ideas?
views:
73answers:
3
+1
A:
Hmm... we could add a -a flag... But until we do, I would use the histedit or collapse extensions or maybe just do it myself:
$ hg update qparent
$ hg revert --all --rev qtip
$ hg commit -m 'Everything in one commit'
$ hg qpop -a
You then need to remove the patches -- perhaps you can just remove .hg/patches entirely, or you can delete some of them and edit .hg/patches/series to match.
Martin Geisler
2010-09-15 09:54:00
Or use `hg qdelete`?
shambulator
2010-09-15 12:51:14
shambulator: I did not suggest `hg qdelete` since it also lacks a `-a` flag.
Martin Geisler
2010-09-15 19:15:20
Ah! Good reason!
shambulator
2010-09-15 22:14:39
So maybe we need to add two `-a` flags :)
Martin Geisler
2010-09-16 20:09:51
A:
With your xargs approach, did you remember that qfold only folds unapplied patches into an applied patch? This worked for me (Windows) to fold all patches into the first patch:
hg qpop -a # remove all patches
hg qpush # apply first one
for /f %i in ('hg qunapplied') do hg qfold %i # fold remaining patches
Mark Tolonen
2010-09-20 04:27:48