Strategies for push/merge problem?

Joe Turpin joe.turpin at gmail.com
Tue Jul 15 13:17:31 CDT 2008


On Tue, Jul 15, 2008 at 1:00 PM, Douglas Philips <dgou at mac.com> wrote:
> qrecord (if it existed)... letting me put the different hunks into
> different patches, would be a way to avoid that. (As I understand it,
> the reason for the qpush/qpop dancin' is to get the hunks into the
> right paches?)
>
> --Doug

As I understand (and use) it, qpop and qpush just changes what patches
are applied to your working directory. qrefresh is a (the most)
restrictive form of your qrecord; i.e. record the changes to qtop.
qrecord is theoretically possible to implement (I'm guessing), but
wouldn't succeeded in obvious circumstances, or rather shouldn't; e.g.
trying to record to patch p1 changes to a function added by p2.

Also, if I've understood you, qrecord would just be "hg qnew -f
new.patch", qpop/qpush to the correct patch, and "hg qfold new.patch".
Is that right? Is that possible now? Haven't tried.

--Joe


More information about the Mercurial mailing list