hi,<div><br></div><div>as an experiment, i tried to convert the subversion gar repository to git and mercurial:</div><div> * <a href="http://code.google.com/p/gar/" target="_blank">http://code.google.com/p/gar/</a> (hg)</div>
<div> * <a href="https://github.com/opencsw/gar" target="_blank">https://github.com/opencsw/gar</a> (git)</div><div><br></div><div>
where i was aware of a user name i entered you as owner as well.</div><div><br></div><div>what i am not sure is how to handle externals and patches onto them, but i saw posts like:</div><div>* <a href="http://www.undefinedrange.com/posts/git-submodules-external-repositories-and-deployment" target="_blank">http://www.undefinedrange.com/posts/git-submodules-external-repositories-and-deployment</a></div>
<div><br></div><div>what do you think, in general about a conversion, and in special, how to do this patching?</div><div><br></div><div>rupert.</div><div><br></div><div><br><br><div class="gmail_quote">On Thu, Jan 6, 2011 at 02:30, Ben Walton <span dir="ltr"><<a href="mailto:bwalton@opencsw.org" target="_blank">bwalton@opencsw.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Excerpts from rupert THURNER's message of Wed Jan 05 14:12:46 -0500 2011:<br>
<br>
Hi Rupert,<br>
<br>
I'm sorry this wasn't easier for you.<br>
<div><br>
> * try to build, not all patches applied<br>
> * throw away the old patches, check in<br>
<br>
</div>First, a recommendation: Never throw away patch/script/foo files from<br>
an existing build until you've got a working replacement. I've kicked<br>
myself a few times for doing this. :)<br>
<br>
In a situation like this, I'd see if I could get the patches to apply<br>
manually using patch or other methods.<br>
<div><br>
> * "gmake extract" to get the source back<br>
> * edit the files again like it should be<br>
<br>
</div>Although it may not complain, makepatch would prefer to be called<br>
after `gmake patch` to ensure all existing patches are applied. I<br>
forget whether I enforced this with a constraint or not...If not, I<br>
don't recall a the reason why I didn't.<br>
<div><br>
> * "gmake makepatch"<br>
> * "gmake package", failed as there is a new file which would need<br>
> patching as well.<br>
<br>
> * "gmake clean", "gmake extract" again<br>
> * edit the file<br>
> * "gmake makepatch" again<br>
<br>
</div>Did you see your first patch applied in this process at all? If not,<br>
you're working on a pre-patched set of files.<br>
<div><br>
> then i forgot to delete a line in a file which is already patched, and<br>
> i thought about repeating above procedure again:<br>
> 1. gmake extract<br>
> applied patch 001<br>
> 2. gmake makepatch<br>
> tried to apply patch 001 again<br>
> which failed.<br>
<br>
</div>This is likely due to creating a patch against the unpatched tree<br>
above. If so, I should look at making sure makepatch cannot run<br>
unless the patch target has already been called. You could,<br>
potentially still have problems though...<br>
<div><br>
> then i gave up for the moment ... but this cannot be it, isn't it?<br>
> should we switch to the whole source from subversion to git and it<br>
> would be neater? then patches could be rebased instead of applied<br>
> newly.<br>
<br>
</div>I wouldn't object[1], but others may disagree. It's also a huge<br>
undertaking. I know that many others are also using git quite a bit<br>
lately too.<br>
<br>
The first major portion of this transition would require separating<br>
GAR (the tool) from the build recipes. Git simply doesn't handle<br>
(nicely) the idea of an external like subversion does. This would be<br>
the final impetus to separate the two, most likely using Sebastian's<br>
excellent mgar!<br>
<br>
I know that Maciej has been having both success and frustration using<br>
the git-svn bridge as of late...<br>
<br>
Thanks<br>
-Ben<br>
<br>
[1] It would actually make my day!<br>
--<br>
Ben Walton<br>
Systems Programmer - CHASS<br>
University of Toronto<br>
C:<a href="tel:416.407.5610" value="+14164075610" target="_blank">416.407.5610</a> | W:<a href="tel:416.978.4302" value="+14169784302" target="_blank">416.978.4302</a><br>
<br>
_______________________________________________<br>
maintainers mailing list<br>
<a href="mailto:maintainers@lists.opencsw.org" target="_blank">maintainers@lists.opencsw.org</a><br>
<a href="https://lists.opencsw.org/mailman/listinfo/maintainers" target="_blank">https://lists.opencsw.org/mailman/listinfo/maintainers</a><br>
.:: This mailing list's archive is public. ::.<br>
</blockquote></div><br></div>