Note I didn't say that SVN was going to be any good at doing these. I just was disagreeing with your statement that SVN "couldn't" do these things. :-)<br><br><div class="gmail_quote">On Fri, Jul 11, 2008 at 8:40 AM, Jeffrey Ollie <<a href="mailto:jeff@ocjtech.us">jeff@ocjtech.us</a>> 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="Ih2E3d">On Thu, Jul 10, 2008 at 11:41 PM, Colin Burnett <<a href="mailto:cmlburnett@gmail.com">cmlburnett@gmail.com</a>> wrote:<br>
><br>
> Though this svn:mergeinfo support should make merges less<br>
> painful...when finally implemented. Though, using a property for<br>
> merge info seems like a cheap hack to me. In git the merge commit has<br>
> two parent commits which intrinsically and permanently links the<br>
> merge. A number of the outstanding issues seem entirely expected for<br>
> a tacked-on solution. I'm being smug. :)<br>
<br>
</div>It *is* a cheap hack. I've used the predecessor "svnmerge" script<br>
before (as I said it's in heavy use by Digium on Asterisk). Basically<br>
what it does is use a special property to keep track of what<br>
changesets have been "merged" into the current branch. And by<br>
"merged" I mean extract a diff from the changeset on the other branch<br>
and apply the diff to the current branch and commit it if there were<br>
no conflicts. The svnmerge script kept the log message (mostly) but<br>
the committer ID would be whoever ran the svnmerge script. The<br>
svnmerge script would also merge several changesets on the other<br>
branch into a single commit on the branch being merged into. Not very<br>
friendly if you're trying to do a blame/annotate type operation.<br>
<br>
Jeff<br>
<div><div></div><div class="Wj3C7c">_______________________________________________<br>
Cialug mailing list<br>
<a href="mailto:Cialug@cialug.org">Cialug@cialug.org</a><br>
<a href="http://cialug.org/mailman/listinfo/cialug" target="_blank">http://cialug.org/mailman/listinfo/cialug</a><br>
</div></div></blockquote></div><br>