[Dune] [#981] git support for dunecontrol (Attachment added)

[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 - Sven Marnach (sven)

----------
I'm sorry, my last comments were partially wrong.  I assumed git-svn would set `FETCH_HEAD` after doing "git svn fetch".  Well, it doesn't.  And there is no way to find out which svn branch "git svn rebase" would rebase upon.  "git svn" determines this branch by parsing the whole output of "git log", but there is know way to make git-svn reveal this information, which means that the whole idea doesn't work.

I attached a new version of the patch which first tests whether the current HEAD points to a commit that came from svn, and if it does, it calls "git svn rebase".  Otherwise, it calls "git remote update" to update all remotes, and finally tries to fast-forward using "git merge --ff-only".

Another advantage over the previous patch is that it doesn't error out if there are neither git nor svn remotes.  (I think dunecontrol would stop on any command that has non-zero exit code since it runs with "set -e".)

I've tested this version with a few of my repositories, and it seems to work fine.  I didn't test really rigorously, but I'm pretty confident the patch won't lead to data loss.

Note that the new version of the patch is against the current trunk.
----------

One or more files have been attached.

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

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.