Received: from maia.hub.org (maia-5.hub.org [200.46.204.29]) by mail.postgresql.org (Postfix) with ESMTP id 78C68632868 for ; Sun, 18 Jul 2010 07:23:47 -0300 (ADT) Received: from mail.postgresql.org ([200.46.204.86]) by maia.hub.org (mx1.hub.org [200.46.204.29]) (amavisd-maia, port 10024) with ESMTP id 04696-08 for ; Sun, 18 Jul 2010 10:23:40 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-out1.uio.no (mail-out1.uio.no [129.240.10.57]) by mail.postgresql.org (Postfix) with ESMTP id D21326325C9 for ; Sun, 18 Jul 2010 07:23:39 -0300 (ADT) Received: from mail-mx2.uio.no ([129.240.10.30]) by mail-out1.uio.no with esmtp (Exim 4.69) (envelope-from ) id 1OaR21-0003hg-Bg; Sun, 18 Jul 2010 12:23:37 +0200 Received: from ti0153a380-2012.bb.online.no ([83.108.26.224] helo=[10.1.1.200]) by mail-mx2.uio.no with esmtpsa (TLSv1:AES256-SHA:256) user rafael (Exim 4.69) (envelope-from ) id 1OaR20-0007XK-R0; Sun, 18 Jul 2010 12:23:37 +0200 Message-ID: <4C42D61C.7010201@usit.uio.no> Date: Sun, 18 Jul 2010 12:23:24 +0200 From: Rafael Martinez User-Agent: Thunderbird 2.0.0.24 (X11/20100317) MIME-Version: 1.0 To: Tom Lane CC: Steve Atkins , pgsql-docs Subject: Re: Documentation and explanatory diagrams References: <201007100001.o6A01to03428@momjian.us> <4C3973CF.80608@usit.uio.no> <9DCA3CE9-0DF2-4F9B-97A6-3FA538A949FB@blighty.com> <7984.1279376823@sss.pgh.pa.us> <4C42D1E6.8000703@usit.uio.no> In-Reply-To: <4C42D1E6.8000703@usit.uio.no> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-UiO-Ratelimit-Test: rcpts/h 8 msgs/h 3 sum rcpts/h 8 sum msgs/h 3 total rcpts 367 max rcpts/h 8 ratelimit 0 X-UiO-Spam-info: not spam, SpamAssassin (score=-8.0, required=5.0, autolearn=disabled, UIO_MAIL_IS_INTERNAL=-5, UIO_PGP_SIGNED=-3, uiobl=NO, uiouri=NO) X-UiO-Scanned: E06385466EEDE448AD33920F62310EF1DADD4C9A X-UiO-SPAM-Test: remote_host: 83.108.26.224 spam_score: -79 maxlevel 80 minaction 2 bait 0 mail/h: 3 total 3 max/h 3 blacklist 0 greylist 0 ratelimit 0 X-Virus-Scanned: Maia Mailguard 1.0.1 X-Spam-Status: No, hits=-2.311 tagged_above=-5 required=5 tests=BAYES_20=-0.001, RCVD_IN_DNSWL_MED=-2.3, T_RP_MATCHES_RCVD=-0.01 X-Spam-Level: X-Archive-Number: 201007/131 X-Sequence-Number: 5787 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Rafael Martinez wrote: > > All this means that xml files generated by DIA er VCS friendliness, they > only change the attributes/objects changed between versions of the > diagram. It can be used without problems to diff the contents and create > patches that modify the last version of the diagram. > I should add to this that I don't know how easy will be to resolve a 'VCS conflict' if two different users try to commit new versions with changes to the same portion of the file. I suppose it won't be easy to fix this manually if you have many changes to the same portion of the xml code. regards, - -- Rafael Martinez, Center for Information Technology Services University of Oslo, Norway PGP Public Key: http://folk.uio.no/rafael/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkxC1hoACgkQBhuKQurGihRhwgCfesdb9DC5AzrlSSluw4MfbkeA /WsAnjF1+EZB9EtEDcWIwgLtszd/UA0E =PIBx -----END PGP SIGNATURE-----