-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi Vladimir,

Am Do den 16. Aug 2012 um 15:46 schrieb Vladimir Nadvornik:
> I think that one of the reasons of stalled development was creating the 
> personal branches in git, without setting processes for merging.

For me it was/is two things:
1. Limited time :-)
2. Sometimes frustration that it took so long to get the code push out
   to the customers and not be able to address bugs directly. (That
   point should be fixed right now as I am responsible for it myself.
   ;-)

> I am still 
> not that familiar with various development models that git allows, so I'd 
> suggest to keep it simple, similar to subversion workflow:

I do not like the subversive^Wsubversion workflow. But ...

> - master branch should always compile and basically work
> - every developer with git access is responsible for pushing his
>   code to master as soon as it meets the above criteria
> - no official code review, but everybody is encouraged to look at the changes
> - problems are solved when they arise, reverting a commit is easy

... that sounds reasonable but is not subversion workflow.

In subversion you mainly has only one branch -- trunk -- that everybody
commits to. And as it is that hard to make a branch nobody use it. So
either the people commit not working stuff or they do not commit until
everything is finished. I find that a frustrating way. See my lua
implementation. It worked well but I did not find it mature enough to
merge it to master. With the svn model Nobody could see it.

As you might have seen, I did some cherry-picks to the stable branch and
even merged stuff to master when I was thinking it is mature enough. And
with git it is possible to also merge master to the own branch and make
it possible to merge it back to master. With svn that often ends in a
complete redesign for long ongoing development.

To your second point, merging, not pushing. In seldom cases cherry-picks
are also suitable.

Regards
   Klaus
- -- 
Klaus Ethgen                              http://www.ethgen.ch/
pub  4096R/4E20AF1C 2011-05-16   Klaus Ethgen <kl...@ethgen.de>
Fingerprint: 85D4 CA42 952C 949B 1753  62B3 79D0 B06F 4E20 AF1C
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQGcBAEBCgAGBQJQLQ32AAoJEKZ8CrGAGfasa6wL+wUhns9RrGT1WqNjECux5j5q
LUSHjF12mdI2BlQAiVHhkzcTWy3mxfY4eCKFWQ93a4mPjNflnob2m84VDF0RFuf4
5AbY5D13vBszmX3GgXakyQCzVSmfrTCSarklVbwQxVe+WxvWnTeeaccO6OIGJihF
JkL5kHbFCNshVO+eo5y+m1cCxgQ3hK6ZUSPPfMitCA/HdGMgO6cNZP8X9PKPmqLW
4/hCvEstu0nm8aaUgRj70D68ELM9XR3+0x78nsfuHfFkTGHKdxF/EZpsCWxuWW/m
Y5vbhFHHmzTCqDwVNKSR7l7nulOiwoOZXBWfY9uo91XIOCvTvLB6uVDUoArAxdof
KAUFg6OsXkhvyWJxLEaq2ZEnVdNTQzxrHBYSojZWmke/lfGEhB1QObB5QZ5Xam24
PLaqAo+xeRm8YqgPxzEibDPeicBoS2Z667HXgwVqKFAl27NfZ0gSmyrBbdDZ7R9x
xbVVTbtkt7+NCI+gEACEVmfMZMG/A1XHLDGuTj5+Qg==
=bXZd
-----END PGP SIGNATURE-----

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Reply via email to