<p>Rebase changes mtime on files that are changed in "my" copy, but not in the upstream version.</p>
<p>Matt, you are just reading the wrong (i.e. unhelpful) side of the diff. </p>
<div class="gmail_quote">On Feb 18, 2012 9:45 PM, "Matthew Knepley" <<a href="mailto:knepley@gmail.com">knepley@gmail.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Fix the mail headers for this thing. My message is below.<div><br></div><div> Matt<br><br><div class="gmail_quote">---------- Forwarded message ----------<br>From: <b class="gmail_sendername">Mail Delivery System</b> <span dir="ltr"><<a href="mailto:MAILER-DAEMON@mailrelay.anl.gov" target="_blank">MAILER-DAEMON@mailrelay.anl.gov</a>></span><br>
Date: Sat, Feb 18, 2012 at 9:44 PM<br>Subject: Undelivered Mail Returned to Sender<br>To: <a href="mailto:knepley@gmail.com" target="_blank">knepley@gmail.com</a><br><br><br>This is the mail system at host <a href="http://mailrelay.anl.gov" target="_blank">mailrelay.anl.gov</a>.<br>
<br>
I'm sorry to have to inform you that your message could not<br>
be delivered to one or more recipients. It's attached below.<br>
<br>
For further assistance, please send mail to postmaster.<br>
<br>
If you do so, please include this problem report. You can<br>
delete your own text from the attached returned message.<br>
<br>
The mail system<br>
<br>
<<a href="mailto:petsc-dev@zimbra.anl.gov" target="_blank">petsc-dev@zimbra.anl.gov</a>>: host <a href="http://zimbra.anl.gov" target="_blank">zimbra.anl.gov</a>[130.202.101.12] said: 550 5.1.1<br>
<<a href="mailto:petsc-dev@zimbra.anl.gov" target="_blank">petsc-dev@zimbra.anl.gov</a>>: Recipient address rejected: <a href="http://zimbra.anl.gov" target="_blank">zimbra.anl.gov</a> (in<br>
reply to RCPT TO command)<br>
<br>Final-Recipient: rfc822; <a href="mailto:petsc-dev@zimbra.anl.gov" target="_blank">petsc-dev@zimbra.anl.gov</a><br>
Original-Recipient: <a href="mailto:rfc822%3Bpetsc-dev@zimbra.anl.gov" target="_blank">rfc822;petsc-dev@zimbra.anl.gov</a><br>
Action: failed<br>
Status: 5.1.1<br>
Remote-MTA: dns; <a href="http://zimbra.anl.gov" target="_blank">zimbra.anl.gov</a><br>
Diagnostic-Code: smtp; 550 5.1.1 <<a href="mailto:petsc-dev@zimbra.anl.gov" target="_blank">petsc-dev@zimbra.anl.gov</a>>: Recipient address<br>
rejected: <a href="http://zimbra.anl.gov" target="_blank">zimbra.anl.gov</a><br>
<br><br>---------- Forwarded message ----------<br>From: Matthew Knepley <<a href="mailto:knepley@gmail.com" target="_blank">knepley@gmail.com</a>><br>To: <a href="mailto:petsc-dev@zimbra.anl.gov" target="_blank">petsc-dev@zimbra.anl.gov</a>, For users of the development version of PETSc <<a href="mailto:petsc-dev@mcs.anl.gov" target="_blank">petsc-dev@mcs.anl.gov</a>><br>
Cc: <br>Date: Sat, 18 Feb 2012 21:44:32 -0600<br>Subject: Re: [petsc-dev] Merge sets<br>On Sat, Feb 18, 2012 at 9:28 PM, Barry Smith <span dir="ltr"><<a href="mailto:bsmith@mcs.anl.gov" target="_blank">bsmith@mcs.anl.gov</a>></span> wrote:<br>
<div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
On Feb 18, 2012, at 3:18 PM, Matthew Knepley wrote:<br>
<br>
> I have lost the BB battle, however can we at least start using<br>
><br>
> hg pull --rebase<br>
><br>
> so that we avoid this<br>
><br>
> <a href="https://bitbucket.org/petsc/petsc-dev/changeset/ad9064ecab66" target="_blank">https://bitbucket.org/petsc/petsc-dev/changeset/ad9064ecab66</a><br>
<br>
<br>
1) I don't like the idea of a pull doing anything locally on my machine. I want it to only get the stuff from the remote repository and bring it to my machine. This reeks of svn<br></blockquote><div><br></div><div>
I see it as a replacement for multiple repositories and carefully orchestrated pulling, like Linus used to do, in order</div><div>to keep change sets clean. It is not giving up on the concept of change sets like svn.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
2) If the rebase implementation has been fixed from the hacky versions that fucked unnecessarily with my file system I'll be happy to start using rebase. Is it fixed?<br></blockquote><div><br></div><div>I cannot identify the behavior from that description. However, I have been using it for almost a year now, and the</div>
<div>nice thing is that if anything goes wrong (merges with MacHg can screw up badly), I just do</div><div><br></div><div> hg rollback</div><div> hg revert --all</div><div><br></div><div>You might be talking about the need to revert.</div>
<div><br></div><div> Matt</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Barry<br>
<br>
><br>
> Matt<br>
<span><font color="#888888">><br>
> --<br>
> What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>
> -- Norbert Wiener<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br>What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>
-- Norbert Wiener<br>
<br></div><br><br clear="all"><div><br></div>-- <br>What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>-- Norbert Wiener<br>
</div>
</blockquote></div>