IMHO, this was a very good reason for a force push, as the tree history was messed severely<div>(i.e. there were three sets of the same commits, as the same changes were rebased. As</div><div>you said "this was a rebase of remote/master on top of master, followed by a merge of</div>
<div>master and remote/master". The result wasn't pretty :/ Thus, this was one of the cases</div><div>where fixing history like that was a good thing (and a lot of people on IRC agreed on this, too).</div><div><br>
</div><div>In any case, since I was one of the people affected by this: one solution to fix your local</div><div>tree if you got these odd commits is to perform a hard reset of master before the oddness</div><div>happened, and then do a force fetch and rebase.</div>
<div><br></div><div>Regards</div><div>Filippos<br><br><div class="gmail_quote">On Mon, Feb 28, 2011 at 10:36 PM, Willem Jan Palenstijn <span dir="ltr"><<a href="mailto:wjp@usecode.org">wjp@usecode.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">Hi all,<br>
<br>
I hope this won't happen often, but I just did a force-push of master from<br>
0f7dcac15591c4ea3def6ff16bb8cf0d6321809c back to<br>
3550e1056884995a524db51fab56d0097c5b6398 to undo a broken merge after quick<br>
deliberation on IRC. The merge merged a rebased copy of master with master,<br>
duplicating 7 commits. The removed commit was up for 8 minutes, so hopefully<br>
not many people were affected other than those involved on IRC.<br>
<br>
If you run into trouble because of this, please let me know and we can figure<br>
out what to do to fix it.<br>
<br>
<br>
Any discussion on if this was an appropriate use of a force-push is welcome...<br>
<br>
<br>
-Willem Jan<br>
<br>
------------------------------------------------------------------------------<br>
Free Software Download: Index, Search & Analyze Logs and other IT data in<br>
Real-Time with Splunk. Collect, index and harness all the fast moving IT data<br>
generated by your applications, servers and devices whether physical, virtual<br>
or in the cloud. Deliver compliance at lower cost and gain new business<br>
insights. <a href="http://p.sf.net/sfu/splunk-dev2dev" target="_blank">http://p.sf.net/sfu/splunk-dev2dev</a><br>
_______________________________________________<br>
Scummvm-devel mailing list<br>
<a href="mailto:Scummvm-devel@lists.sourceforge.net">Scummvm-devel@lists.sourceforge.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/scummvm-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/scummvm-devel</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>"Experience is the name every one gives to their mistakes" - Oscar Wilde <br>
</div>