GNOME Bugzilla – Bug 580000
force_checkout doesn't work
Last modified: 2009-04-23 18:50:43 UTC
I tried to update gnome-common after the new migration. Not surprisingly, the first update failed. I then did force_checkout, and it didn't work. *** erreur durant l'étape « checkout » de gnome-common: ########## Erreur lors de l'exécution de git rebase origin master *** [1/1] [1] relancer l'étape checkout [2] ignorer l'erreur et continuer à l'étape done [3] abandonner ce module [4] démarrer un shell [5] aller à l'étape force_checkout choix : 5 *** Extraction de gnome-common *** [1/1] git fetch git stash save jhbuild-build ChangeLog: needs merge macros2/gnome-common.m4: needs merge ChangeLog: needs merge macros2/gnome-common.m4: needs merge ChangeLog: unmerged (03ce5d2df72f4620a62119e19bcbae06ce0a0916) ChangeLog: unmerged (ec251d7c5e5e3d44196908eb4849c4b2d6132c79) macros2/gnome-common.m4: unmerged (21f3ef1a3e10551ef44e77d9764d682e0f4b70e2) macros2/gnome-common.m4: unmerged (bc9c4556a7f9021cf6e56d7a7ffe805ca75d6469) fatal: git-write-tree: error building trees Cannot save the current index state *** erreur durant l'étape « force_checkout » de gnome-common: ########## Erreur lors de l'exécution de git stash save jhbuild-build *** [1/1]
Here you go. commit a221e78d359810e9bdf671c1fbb312fe2bc35815 Author: Frederic Peters <fpeters@0d.be> Date: Thu Apr 23 20:48:36 2009 +0200 fix force_checkout command to always wipe source directory first Factor out the force_checkout logic in the base Branch class, adding consistent support for the force_checkout command to all version control systems (GNOME #580000).