On Thu, Aug 19, 2010 at 2:12 PM, seb ferris <seb [dot] ferris [..] ...> wrote:
> Hello,
>
> As I' ve said in a previous mail "Problems with OCL 2.0" I've some issue
> with the renaming in RTT2.0.
> I've tried the patch but there is still a problem ( Possible to see it in
> the "Problems with OCL 2.0"mail.
> For a temporary fix I would like to revert to a previous commit.
> I've tried in RTT-2.0.git the command :   git revert
> 94efb93a4af869f336fc61e5a018097548709584
> but the following error appears:
>
>         fatal: 'revert' is not possible because you have unmerged files.
>         Please, fix them up in the work tree, and then use 'git add/rm
> <file>' as
>         appropriate to mark resolution and make a commit, or use 'git commit
> -a'.
>
> I don't know exactly how to interpret it. Is there an other way to revert?
> Or to solve my problem?

You just used the wrong command. You need 'reset', in order to go back
to an older version.

For example:

git reset --hard 94efb93a4af869f336fc61e5a018097548709584

Will clean up your working copy and rewind to that revision. If you
want the version before that, say so with:

git reset --hard 94efb93a4af869f336fc61e5a018097548709584~1

If you want to peel off one commit at a time, you can do so with

git reset --hard HEAD~1

ie remove the most recent commit. See git log for the effects. A 'git
pull' will however update your branch again to the latest version in
the repository.

revert is only used to undo a previous commit without breaking
history, ie to apply the inverse patch of a given commit.

Peter
--
Orocos-Users mailing list
Orocos-Users [..] ...
http://lists.mech.kuleuven.be/mailman/listinfo/orocos-users