[darcs-users] Whatsnew on a rolled back repo

Guillaume Hoffmann guillaumh at gmail.com
Mon Aug 25 19:57:44 UTC 2014


The revert command creates a bundle in _darcs/patches/revert , you way
find the information you need in that file.

2014-08-17 6:26 GMT-03:00 Gian Piero Carrubba <gpiero at rm-rf.it>:
> Use case:
>
> I've a repo with patches A and B that are mutually exclusive. They aren't
> conflicting, but both define a same-named function, so the sw won't compile
> if both are applied. The simple solution is to rollback the undesired one
> before compiling, then revert the repo afterwards. Now I've discovered that
> last time I've forgotten to do the revert step. If I do a revert now, I'll
> lose any change I could have done in the repo while in the rolled-back


> status, so I need a way for displaying the changes in the working dir other
> than the ones generated by the rollback command.

Sorry, there is no simple way of tracking these changes apart from
other, "manual", changes you may have done in the working copy.

You may clean your working copy with the default, interactive revert command.

Another option would be to clone your repository R1 into another one
R2, run rollback of the same function in R2, record a patch P1, then
copy the working copy of R1 into R2 and record a patch P2. If P1 and
P2 commute, you can pull P1 it back into R1 (after reverting
everything there).

Guillaume


More information about the darcs-users mailing list