<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On 2011-06-16, at 1:39 AM, Sébastien Deleuze wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">Correct me if I am wrong but if I merge feature-x in default, I have to be on default, so currently I have to update my repo after the merge commit to feature-x, and then close the branch. What is quite boring is this sequence :<br>
- Work on feature-x<br> - switch to default in order to merge feature-x in default<br> - switch to feature-x to close it<br> - switch to default since feature-x is closed<br><br></blockquote><div><br></div><div><br></div>Yes I believe you are correct. My mistake.</div><div><br></div><div>Scott</div><div><br><blockquote type="cite"><div class="gmail_quote">On Thu, Jun 16, 2011 at 3:08 AM, Scott Palmer <span dir="ltr"><<a href="mailto:swpalmer@gmail.com">swpalmer@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div class="im"><br><br><div class="gmail_quote">On Wed, Jun 15, 2011 at 7:40 PM, Sébastien Deleuze <span dir="ltr"><<a href="mailto:seb@deleuze.fr" target="_blank">seb@deleuze.fr</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>We usually want to check that the merge is ok before closing the branch. So the workflow is not really easy and produce an artificial head for the close commit. Having thousands of these close commit heads is quite bad when viewing your grah log<br>
$ hg up default<div><br> $ hg merge feature-x<br> $ hg ci -m merge<br></div> $ hg up feature-x<br> $ hg ci -m 'Closed branch feature-x' --close-branch<br></blockquote></div><br></div>Don't you test that the merge was ok before you check it in? Then can't you check in the merge and close the branch at the same time?<br>
<br> $ hg merge feature-x<br># check that merge is okay<br> $ hg ci -m "merge and close feature branch" --close-branch<br><br>As I understand it, the branch name is really still there anyway.. so if you had to fix something you can still update to that branch, do the fix, and close it again. Am I wrong about that?<br>
<br>Interesting to read about your experience with bookmarks. I am just writing something up to suggest a workflow based on bookmarks to our developers, but I haven't used things enough to know if we will run into the same issues. Looks like I have a few more experiments to do!<br>
<font color="#888888">
<br>Scott<br>
</font></blockquote></div><br>
</blockquote></div><br></body></html>