<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div>On Feb 21, 2012, at 11:18 AM, Pierre-Yves David wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>On Tue, Feb 21, 2012 at 12:18:05PM +0200, Idan Kamara wrote:<br><blockquote type="cite">On Mon, Feb 20, 2012 at 6:29 PM, Antoine Pitrou <<a href="mailto:solipsis@pitrou.net">solipsis@pitrou.net</a>> wrote:<br></blockquote><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">On Mon, 20 Feb 2012 17:19:44 +0100<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">Jason Harris <<a href="mailto:jason@jasonfharris.com">jason@jasonfharris.com</a>> wrote:<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><blockquote type="cite"><br></blockquote></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><blockquote type="cite">To the user, the amend part is really associated with commit. It's doing<br></blockquote></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><blockquote type="cite">the<br></blockquote></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"><blockquote type="cite">same thing.<br></blockquote></blockquote></blockquote><br>I still disagree on this point. From the user point of view:<br><br> "commit" *create* a new changeset.<br><br> "amend" *update* the content of an existing changeset.<br><br>This is not the same thing at all.<br><br>qnew != qrefresh<br>commit != amend<br></div></blockquote><div><br></div><div>This analogy is faulty. The word "commit" does _not_ imply creating anything new; it indicates saving what's already present (which could apply equally to creating a new change set or updating the current one). The command 'qnew', by contrast, contains the word "new" right inside it.</div><div><br></div><div>It's thus perfectly clear from the terms used what the following two operations would do:</div><div><br></div><div>$ hg commit # save what I've got</div><div>$ hg commit --amend # save what I've got by updating what I saved before</div><div><br></div><div>If we eventually want to have a more powerful 'amend' command that can do something besides just updating the working dir parent (and only if said parent is a head!), then 'commit --amend' becomes a perfectly cromulent shorthand for 'amend .' or whatever, similarly to the way that pull --update is shorthand for pull && update.</div><div><br></div></div><div>
<span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; "><span class="Apple-style-span" style="orphans: 2; text-align: -webkit-auto; text-indent: 0px; widows: 2; -webkit-text-decorations-in-effect: none; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">pacem in terris / мир / शान्ति / سَلاَم / 平和</div><div style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Kevin R. Bullock<br></div></span></span>
</div>
<br></body></html>