[darcs-users] How to reset a file to an older state?
Juliusz Chroboczek
Juliusz.Chroboczek at pps.jussieu.fr
Sat Apr 29 20:37:17 UTC 2006
> I basically have this transform working--using sed--when I stumbled on
> the following:
If anyone is as confused as I initially was -- I assume this is due to
Patch applying hunks in parallel, while Darcs applies them
sequentially. Thomas, is that right?
> What about `darcs record --at-{match,patch,tag}=...'? This would
> internally reset the repository to the specified state and then record
> either the whole repository or only potentially specified files.
No, because then you have two classes of conflicts -- conflicts
between pending and the repo, and conflicts between the new patch and
the repo. Experience shows that users are usually confused by
conflicts involving pending.
(Pro memoria, ``pending'' is the patch that describes the differences
between pristine and working. It doesn't actually exist, it's
computed on the fly.)
Juliusz
More information about the darcs-users
mailing list