Hi Marius,<br><br><div class="gmail_quote">On Tue, Mar 3, 2009 at 11:23 PM, Marius Kruger <span dir="ltr"><<a href="mailto:amanic@gmail.com">amanic@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div class="gmail_quote">2009/3/4 Eric Berry <span dir="ltr"><<a href="mailto:elberry@gmail.com" target="_blank">elberry@gmail.com</a>></span><div class="im"><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
The problem with this approach is that we get the merges from trunk as part of Joe's history - which isn't bad, but can distract Bob from Joe's real changes.</blockquote></div><div><br>I don't think its that bad or that it is really avoidable other than using `bzr replay` from the rebase plugin.<br>
I think if you standardize the merge commit message eg. "merge main", <br>you should be able to ignore them easily enough.</div></div></blockquote><div><br>Yeah definitely. :) I didn't think it was that bad either, just wanted to see if there was any way to avoid it. It sounds like there isn't and it's acceptable. :)<br>
<br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class="gmail_quote"><div><br>After you merge his changes into main, <br>`bzr diff` would in any case show you all the real changes he made.<br>
</div></div></blockquote><div><br>Good point, I didn't think of that.<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class="gmail_quote">
<div></div><div><br>this is bad, don't even consider it IMHO<br> </div></div></blockquote><div><br>Yeah, I wanted to avoid this one all together, but it did seem like another viable approach.<br><br>So it seems like option 1 is the best solution for the situation?<br>
<br>Thanks so much for all the help!<br>Eric<br clear="all"></div></div><br>-- <br>Learn from the past. Live in the present. Plan for the future.<br>11101000<br><a href="http://www.townsfolkdesigns.com/blogs/elberry">http://www.townsfolkdesigns.com/blogs/elberry</a><br>