[Adium-devl] Version control

[Gary Kramlich]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Richard Laager wrote:

<snip>

> Yes, this is a change. It means a few more commands, that's true. It
> also allows for different workflows.
> 
> Richard

Here's a good example of a different work flow that a dvcs allows.  But
here's a little back story.  We received a patch (see the ticket) to fix
building against glib/gtk 2.0.  The patch works, but needs a some work
in my opinion.  Below are my suggestions to the patch, and how we handle
patches that weren't 'mtn served' if they need work.  If it *was* 'mtn
serve''d it would be a 'mtn pull' from the submitters db rather than
using patch.

(09:46:45 PM) John Bailey: http://plugins.guifications.org/trac/ticket/416
(09:46:52 PM) John Bailey: do I want to apply that?
(09:47:35 PM) Gary Kramlich: commit it, then fix it
(09:47:43 PM) Gary Kramlich: ie, kill the #ifdef replace with
G_CHECK_VERSION
(09:48:10 PM) Gary Kramlich: remove doxygen comments
(09:48:59 PM) Gary Kramlich: rename glib-compat.h to glib_compat.h
(09:49:15 PM) Gary Kramlich: move the glib_compat.h include to pp_internal.h
(09:50:20 PM) John Bailey: grr, patch doesn't like to create files?
(09:50:37 PM) Gary Kramlich: no, touch first
(09:52:25 PM) John Bailey: ugh, I'm going to have to update my workspace
to the tag, then commit and merge
(09:53:45 PM) John Bailey: actually no I don;t
(09:53:54 PM) John Bailey: I can just remove the extra hunks from the patch
(09:54:13 PM) John Bailey: all the added include hunks are rejecting
because of all the changes I've made in those areas
(10:01:55 PM) Gary Kramlich: heh
(10:02:42 PM) John Bailey: or just fix the busted paths in the diff
which were the real problem

The difference here from svn.  Is that John is able to commit the patch
unmodified, which I find to be important to the submitter, and then
clean it up for a more proper inclusion.  All the while, not breaking
our main database since he's working purely on his machine and will push
when it acceptable.  IE, compiling, and meets the requirements I set.

- --
Gary Kramlich <grim at reaperworld.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHCvFydf4lmqisgDIRAidJAKCeNStq64uj8rdqexOSryBFQNsI+ACghstE
HyURDtNsWcO01KhN+v1dKGo=
=mG5x
-----END PGP SIGNATURE-----