[darcs-users] 'darcs rebase unsuspend' with unrecorded changes
lemming at henning-thielemann.de
Fri May 22 09:25:29 UTC 2015
Ganesh Sittampalam wrote:
> On Wed, 20 May 2015, Henning Thielemann wrote:
> > What to do now? Shall I do 'darcs revert' before 'unsuspend' and
> > 'darcs unrevert' after 'unsuspend'? Like 'git stash' and 'git stash
> > pop'?
> To be safe I'd suggest recording, "darcs obliterate -O" to save the
> patch to disk, unsuspend, then "darcs apply" to reapply it. At this
> point you may have some conflicts to resolve if it conflicted with the
> previously suspended patches.
This makes sense. I guess, I can also 'record' and later 'unrecord'.
"obliterate" sounds so dangerous. :-)
More information about the darcs-users