6 messages in com.perforce.perforce-user[p4] Re: Binary diff/merge plugins - ...| From | Sent On | Attachments |
|---|---|---|
| Steve Bennett | 02 Jun 2000 14:08 | |
| jorg...@db.com | 05 Jun 2000 04:59 | |
| Jeff A. Bowles | 05 Jun 2000 09:11 | |
| Dave Birkhead | 05 Jun 2000 09:18 | |
| Robert Cowham | 05 Jun 2000 15:16 | |
| Scott Blachowicz | 06 Jun 2000 08:35 |
| Subject: | [p4] Re: Binary diff/merge plugins - some ideas![]() |
|---|---|
| From: | Scott Blachowicz (sco...@sabmail.rresearch.com) |
| Date: | 06/06/2000 08:35:05 AM |
| List: | com.perforce.perforce-user |
"Jeff A. Bowles" <jab at pobox.com> wrote:
The ClearCase "view of the world" uses file suffixes to decide what attributes a file has by default. "*.ps" would default to "text, but don't bother with 'diff' for the deltas since they aren't the efficient way to store the delta anyhow"... ... I worry that having a "default merge program" setable (if that's a word) by file type might present another problem: what if that default program isn't available on platform X?
There are already existing mechanisms to draw upon for such logic...for example, the MIME stuff for mail and HTTP uses a "Content-Type" header to identify the data type. In some cases where the Content-Type isn't known, it is derived from the file's suffix and a lookup table. The Content-Type can then be used by some configuration mechanism on the client to decide what to do with the content. For example, if I'm sitting in a dumb tty and I view a "text/html" attachment with my mutt mail reading program, it finds this entry in a my local "mailcap" file:
text/html; lynx -dump -force_html %s | more; needsterminal
that tells it what command to use to view it. I expect that something conceptually similar could be used with Perforce. The only trick is that the lookup table would need to have per-system overrides (not just per-platform type or per-client workspace) because the utility programs could exist in different directories on the different systems (which could also have different sets of utilities installed).
Scott
Received: from mars.corsol.atlanta.ga.us (mail@[130.205.107.3]) by frankenrouter.perforce.com (8.9.3/8.9.1) with ESMTP id EAA48724 for <Perforce-user at perforce.com>; Sun, 4 Jun 2000 04:50:56 -0700 (PDT) Received: from host2-117.prestige.net (localhost) [63.67.9.117] by mars.corsol.atlanta.ga.us with esmtp (Exim 2.05 #1 (Debian)) id 12yZNZ-0002O7-00; Sun, 4 Jun 2000 08:19:45 -0400 Received: from localhost ([127.0.0.1] helo=machturtle.com) by localhost with esmtp (Exim 3.12 #1 (Debian)) id 12yZNZ-0004Ni-00 for <Perforce-user at perforce.com>; Sun, 04 Jun 2000 08:19:45 -0400 Message-ID: <393A495D.A88C1793 at machturtle.com> Date: Sun, 04 Jun 2000 08:19:41 -0400 From: David Corbin <david.corbin at machturtle.com> X-Mailer: Mozilla 4.72 [en] (X11; I; Linux 2.2.13 i686) X-Accept-Language: en MIME-Version: 1.0 To: Perforce-user at perforce.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-via: mars.corsol.atlanta.ga.us Subject: [p4] JBuilder w/Perforce Sender: perforce-user-admin at perforce.com Errors-To: perforce-user-admin at perforce.com X-BeenThere: perforce-user at perforce.com X-Mailman-Version: 2.0beta2 Precedence: bulk List-Id: Discuss Perforce with other users <perforce-user.perforce.com>
Is anyone out there using these two tools together? The JBuilder project files are causing us a problem. They are ascii files, but they insert "relative numbers" when idenitifying elements of the project. This means a merge of the two is not as simple as mergining the text, but more of renumbering, and it's not just a sequential number problem. Has anyone solved this problem?
-- David Corbin Mach Turtle Technologies, Inc. http://www.machturtle.com dcorbin at machturtle.com
Received: from urdvg002 (urdvg002.cms.usa.net [165.212.11.2]) by frankenrouter.perforce.com (8.9.3/8.9.1) with SMTP id LAA54660 for <perforce-user at perforce.com>; Mon, 5 Jun 2000 11:26:06 -0700 (PDT) Received: (qmail 27728 invoked from network); 5 Jun 2000 18:54:57 -0000 Received: from uadvg128.cms.usa.net (HELO uadvg128) (165.212.11.128) by corprelay.cms.usa.net with SMTP; 5 Jun 2000 18:54:57 -0000 Received: (qmail 7791 invoked by uid 0); 5 Jun 2000 18:54:56 -0000 Received: from guppy [207.21.95.198] by cm16 via mtad (2.6) with ESMTP id 378eFes340312M16; Mon, 05 Jun 2000 18:54:55 GMT Reply-To: <robert at montclare.com> From: "Robert Wotherspoon" <robert at montclare.com> To: <perforce-user at perforce.com> Date: Mon, 5 Jun 2000 11:59:03 -0700 Message-ID: <NCBBJBKOKLEOAFHCDMACKEEICFAA.robert at montclare.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_000A_01BFCEE5.7159B3C0" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0) Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2314.1300 X-MS-TNEF-Correlator: <NCBBJBKOKLEOAFHCDMACKEEICFAA.robert at montclare.com> Subject: [p4] Solaris 8 platform Sender: perforce-user-admin at perforce.com Errors-To: perforce-user-admin at perforce.com X-BeenThere: perforce-user at perforce.com X-Mailman-Version: 2.0beta2 Precedence: bulk List-Id: Discuss Perforce with other users <perforce-user.perforce.com>
This is a multi-part message in MIME format.
------=_NextPart_000_000A_01BFCEE5.7159B3C0 Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 7bit
Hello All,
Has anyone installed Perforce on Solaris 8? The Perforce website states that the latest Solaris version it supports is 7. If you have installed it on 8, did you experience any problems?
Thank you,
Bob Wotherspoon Montclare Technologies, Inc.
------=_NextPart_000_000A_01BFCEE5.7159B3C0 Content-Type: application/ms-tnef; name="winmail.dat" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="winmail.dat"
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 U09MQVJJU1ZFUlNJT05JVFMAAAAAi6E=
------=_NextPart_000_000A_01BFCEE5.7159B3C0--
Received: from oxmail.ox.ac.uk (oxmail2.ox.ac.uk [163.1.2.1])
by frankenrouter.perforce.com (8.9.3/8.9.1) with ESMTP id MAA54848
for <perforce-user at perforce.com>; Mon, 5 Jun 2000 12:00:18 -0700 (PDT)
Received: from ermine.ox.ac.uk ([163.1.2.13])
by oxmail.ox.ac.uk with esmtp (Exim 3.12 #1)
id 12z2Ul-0001Iy-00; Mon, 05 Jun 2000 20:25:07 +0100
Received: from max22.public.ox.ac.uk
([192.76.27.22] helo=localhost.localdomain ident=rahtz)
by ermine.ox.ac.uk with smtp (Exim 3.13 #1)
id 12z2Uk-0007wS-00; Mon, 05 Jun 2000 20:25:06 +0100
X-Mailer: 20.4 "Emerald" XEmacs Lucid (via feedmail 8 Q);
VM 6.71 under 20.4 "Emerald" XEmacs Lucid
From: "Sebastian Rahtz" <sebastian.rahtz at computing-services.oxford.ac.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <14652.473.240046.879967 at localhost.localdomain>
Date: Mon, 5 Jun 2000 20:39:05 +0100 (BST)
To: daveb at extensity.com
Cc: perforce-user at perforce.com
Subject: RE: [p4] Binary diff/merge plugins - some ideas
In-Reply-To: <4C28764D2C67D3119D3F0090279C6F641C6272 at
corp-exch.hq.extensity.com>
References: <4C28764D2C67D3119D3F0090279C6F641C6272 at
corp-exch.hq.extensity.com>
Sender: perforce-user-admin at perforce.com
Errors-To: perforce-user-admin at perforce.com
X-BeenThere: perforce-user at perforce.com
X-Mailman-Version: 2.0beta2
Precedence: bulk
List-Id: Discuss Perforce with other users <perforce-user.perforce.com>
Dave Birkhead writes:
We have a bunch of text files that we use to load our database. These files are in a tabular format. A merge is extremely painful anytime we * Add a column * Remove a column * Globally change the content of a column.
Sounds to me like a perfect argument for using XML instead of plain text...
Sebastian




