Hi folks,
I use fossil for some LabView development (among other dev work). For those
not familiar with it, it's a graphical programming environment, and the
files are binary. That in itself isn't a big deal. Especially because we're
provided with a merge tool. I've tested out the merge command I
On Wed, Sep 21, 2011 at 8:16 PM, Tomek Kott tkott.s...@gmail.com wrote:
I guess the question is, does fossil even attempt to launch the gmerge tool
when merging binary files?
The code says...
The merge command ends up calling merge_3way(), which does:
zGMerge = db_get(gmerge-command,
Then can I put in a feature request for gmerge to support binary file
merging? With the assumption that the user will (through a system dependent
method, like a shell script) call the appropriate binary file merger for the
binary file type passed in? That would make my (merging) life much easier.
On Wed, Sep 21, 2011 at 8:42 PM, Tomek Kott tkott.s...@gmail.com wrote:
Then can I put in a feature request for gmerge to support binary file
merging? With the assumption that the user will (through a system dependent
method, like a shell script) call the appropriate binary file merger for the
To be clear, I'm not saying that fossil needs to handle the binary merge.
That's why the external program is there. The user (who would generically
know what kind of binary files are used in the repo) provides a shell script
for the gmerge command. Fossil calls gmerge (if present) when there is a
On Wed, Sep 21, 2011 at 9:08 PM, Tomek Kott tkott.s...@gmail.com wrote:
As I see it, fossil doesn't need to know what the binary file is...it just
needs to call the external program. If the program can't handle it, then
presumably it would return an error anyway, and hence the same error
On 9/21/2011 3:50 PM, Stephan Beal wrote:
i'm trying to figure out if that's doable with a minor tweak to the
current code, but i just don't see it (but i'm not at all familiar
with the diff/merge code). The first problem i see with this change
now is that the is-it-binary determination is
Hi,
I would like to find out if fossil can handle binary file which means
can checkin and checkout a binary file?
Thanks,
Jenny
-Original Message-
From: fossil-users-boun...@lists.fossil-scm.org
[mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of
On Mon, Jul 25, 2011 at 09:18:32AM -0700, Zhang, Jenny wrote:
Hi,
I would like to find out if fossil can handle binary file which means
can checkin and checkout a binary file?
I use it with any kinds of files without trouble. Just you don't have 'diff' for
binary files.
9 matches
Mail list logo
