<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.32.2">
</HEAD>
<BODY>
Hi,<BR>
<BR>
I do not know either what I good practice, but now that a new commit has been done on the branched 1_7_0 I have now idea how to propagate this in the pull request. I would have created a new personal repository forking the main one and started from zero, but since it is not possible to download a single branch, downloading all takes hours for me, so their might be another commit in the mean time... this way I will never catch up.<BR>
<BR>
So for the moment the easy way I found was to post a new patch here: <BR>
<A HREF="http://trac.osgeo.org/qgis/attachment/ticket/3222/">http://trac.osgeo.org/qgis/attachment/ticket/3222/</A><BR>
(@Tim: it now uses relative paths)<BR>
<BR>
Patch on freshly branched 1_7_0 <A HREF="https://github.com/qgis/Quantum-GIS/commit/6c835b4cf5cd4a4be687e829bb57e3d51e7345f7">https://github.com/qgis/Quantum-GIS/commit/6c835b4cf5cd4a4be687e829bb57e3d51e7345f7</A><BR>
taking into accounts jef's comments at <A HREF="https://github.com/qgis/Quantum-GIS/pull/3">https://github.com/qgis/Quantum-GIS/pull/3</A><BR>
<BR>
Would it be fine for you to work with this?<BR>
I wish also to thank you for the hints you already gave me for improving my code.<BR>
<BR>
All the best,<BR>
Mayeul<BR>
<BR>
Le vendredi 06 mai 2011 à 23:03 +0200, Mayeul Kauffmann a écrit :
<BLOCKQUOTE TYPE=CITE>
<PRE>
Hi Jürgen,
Thanks a lot for the detailed answer!! Sorry to have bothered you; I
agree standardizing indentation can be useful [in fact, it does not make
merging more difficult but easier: if indentation is standardized before
each commit, nobody will never ever have to merge indentation].
"But it's to late for that in your case anyway, as you've already
committed."
I would have forked the new 1_7_0 again, applied my patch here, taken
into account your comment, run the indentation tool, committed, pushed,
and made another pull request. Then I would have deleted my other fork
(is this good practice?)
I will now work on your comments.
Regards,
Mayeul
_______________________________________________
Qgis-developer mailing list
<A HREF="mailto:Qgis-developer@lists.osgeo.org">Qgis-developer@lists.osgeo.org</A>
<A HREF="http://lists.osgeo.org/mailman/listinfo/qgis-developer">http://lists.osgeo.org/mailman/listinfo/qgis-developer</A>
</PRE>
</BLOCKQUOTE>
<BR>
</BODY>
</HTML>