[Dune] [#981] git support for dunecontrol

[Dune]

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.

The following task has a new comment added:

FS#981 - git support for dunecontrol
User who did this - Andreas Lauser (andlaus)

----------
Hi Everyone,

First, let me be clear that, although I'm primarily responsible for the patch, I don't use dunecontrol's update feature and thus I do not really care about whether it gets merged or not. So, without further ado, here are my remarks:

0. git got quite a bit more careful about local changes since Sven wrote FS#479. For example it used to silently revert all local changes when switching branches or it allowed to pull in the middle of a rebase. no more. In addition, there is always 'git reflog' to the rescue if something gets seriously screwed up.
1. On the question of rebase-vs-pull: IMHO that only affects modules which natively use git. for the core modules, you will probably always want to use 'git svn rebase', as it is the only way to work with SVN repositories that I'm aware of. (We can also trivially extend the patch so that it aborts the rebase if there are any conflicts, but in this case dunecontrol would be more careful when using git than when using SVN.) Further, I would mandate for 'git pull' behavior for native git repositories. But let's cross that bridge when we come to it.
2. Finally, I slowly get the impression that the semantics of 'duncontrol update' are too imprecise and should be improved. maybe it should only update modules which do not have any local changes, regardless of the SCM involved.
----------

More information can be found at the following URL:
http://www.dune-project.org/flyspray/index.php?do=details&task_id=981#comment2915

You are receiving this message because you have requested it from the Flyspray bugtracking system.  If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.