<br><div class="gmail_quote">2010/12/3 Charles Lepple<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">I just did a test-merge of branches/AsciiDoc with the trunk, and apart from a few files that were changing in both trees (most notably, the auto-generation of the ChangeLog), it pretty much went as expected.<br>
<br>
How much meta-data do we want to see in the merge commit? I did this with git-svn, so if I do a naive commit back to the trunk, it will basically replay every commit from branches/AsciiDoc into the trunk, which is overkill IMHO (over 300 commits).<br>
<br>
I can also squash it down into one commit, with all of the commit messages merged. This is also a bit heavy, given that each git-svn commit message also includes a SVN URL of sorts.<br>
<br>
What I am leaning towards is a single commit with all of the branches/AsciiDoc commit rev numbers listed. It should be easy to refer back to the original commits in case I screwed something up.<br>
<br>
Any preferences?<font color="#888888"></font></blockquote><div><br>the 3rd would be neat, with an appropriate changelog msg.<br><br>cheers,<br>Arnaud<br></div></div>-- <br>Linux / Unix Expert R&D - Eaton - <a href="http://powerquality.eaton.com" target="_blank">http://powerquality.eaton.com</a><br>
Network UPS Tools (NUT) Project Leader - <a href="http://www.networkupstools.org/" target="_blank">http://www.networkupstools.org/</a><br>Debian Developer - <a href="http://www.debian.org" target="_blank">http://www.debian.org</a><br>
Free Software Developer - <a href="http://arnaud.quette.free.fr/" target="_blank">http://arnaud.quette.free.fr/</a><br><br>