Re: 'darcs rebase unsuspend' with unrecorded changes
Henning Thielemann <[email protected]>
| Newsgroups | gmane.comp.version-control.darcs.user |
|---|---|
| Message-ID | <alpine.DEB.2.02.1505221122120.7413@sputnik> |
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. :-)