On Thu, May 11, 2017 at 09:14:43AM -0400, Richard Hipp wrote:
> On 5/10/17, Ron Aaron <[email protected]> wrote:
> > I tried to revert to a good revision 'xxx' using "fossil revert -r xxx"
> >
> > Despite the help stating "Revert all files if no file name is provided",
> > instead fossil told me, "the --revision option does not work for the
> > entire tree".
>
> Amid all the confusion, I'm not sure this question was ever answered.
> So let me now try...
>
> The "fossil revert" command is intended to undo edits to the local
> check-out and restore the content of files back to the last committed
> version. For example, you start making some change and decide that
> your idea isn't really working out, so you type "fossil revert" to
> take you back to a pristine state. Or you do "fossil revert
> $filename" to undo all of the local edits for a particular file while
> retaining the edits to other files.
>
> The "fossil revert" command only affects the local check-out. It
> makes no changes to the repository.
>
> If you want to move your whole check-out to a different baseline,
> better to do so using:
>
> fossil revert
> fossil update $newbaseline
Which is equivalent to:
$ fossil co --force $newbaseline
For what I've understand from the Ron situation, I believe he needs to
revert to a previous version in trunk (6 or 7 commits ago in his case)
and continue development from there.
That's what I've suggest on my previous post. Exactly the same as what
you suggest above + a "checkin edit" on the web ui to move all the
checkins following the $newbaseline in another branch.
>
> If you want to change a single file to be the same as it was several
> check-ins ago, better to do something like this:
>
> fossil artifact $hash >$filename
If you don't want to use the hash of the file, but the checkin hash (or
a tag name), the following will also works:
$ fossil revert $filename
$ fossil up $newbaseline $filename
And may look more natural for people that are not used to do stdout
redirection to file.
my 2 cents...
Regards,
--
Martin G.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
