On Thu, 2009-02-12 at 18:55 -0500, Owen Taylor wrote: > Non fast-forward update to branch > ================================= > > Subject: [gnome-shell] Non-fast-forward updated to branch master > > The branch 'master' was changed in a way that was not a fast-forward update. > This may cause problems for people pulling from the branch. For more > information, > please see: > > http://live.gnome.org/GitNonFastForward > > Commits removed from the branch: > > 2d3988c... Bug 570579: Redo the layout of overlay components > de1c150... Add librsvg-devel to the OpenSuSE dependency list > > Commits added to the branch: > > 85dae56... Bug 571203 - Handle spaces in overlay search > > <output of git show -p --stat for each new commit> > > > Maybe we just hard forbid this in all cases, but it might make sense > to allow as a (sysadmin-only?) option in recovery-from-stupidity > cases. If someone acccidentally merges a huge experimental branch to > master and pushes it, it's probably better to cause a bit of temporary > pain for people who pulled the bad version.
I think we should forbid this, though we'd probably want to allow sysadmin to do it when necessary. Basically, I would forbid anything that rewrites history. It's painfully easy to do such things in git. -- Shaun _______________________________________________ Gnome-infrastructure mailing list [email protected] http://mail.gnome.org/mailman/listinfo/gnome-infrastructure
