On Apr 12, 2010, at 09:52:37 PDT, D. Richard Hipp wrote:
> Can anyone suggest a good 3-way graphical merger that I can use for
> testing (Mac or Linux).
For Mac, assuming you have the developer tools installed, there is /
usr/bin/opendiff (see man opendiff).
If you have PIVOT, INPUT1, INPUT2 a
On Mon, Apr 12, 2010 at 7:48 PM, Eric wrote:
> If you need access rights set, you include a script to set them - why
> should Fossil itself remember settings that are dependent on the target
> machine and OS?
>
Sorry, i didn't mean to imply that fossil should do that. Fossil does
remember the +x
On 04/12/2010 12:52 PM, D. Richard Hipp wrote:
> Can anyone suggest a good 3-way graphical merger that I can use for
> testing (Mac or Linux).
http://kdiff3.sourceforge.net/
KDiff3 can be used to merge two or three input files and automatically
merges as much as possible. The result is presente
On Monday 12 April 2010 19:52:37 D. Richard Hipp wrote:
> Can anyone suggest a good 3-way graphical merger that I can use for
> testing (Mac or Linux).
'kdiff3' or 'meld' are free
BeyondCompare is not expensive
--
Sending me something private?
Use my GPG public key: AD29415D
signature.asc
2010/4/12 D. Richard Hipp :
>
> On Apr 12, 2010, at 12:52 PM, D. Richard Hipp wrote:
>
>>
>> On Apr 12, 2010, at 12:48 PM, Johan Samyn wrote:
>>>
>>> It would be interesting to have Fossil automatically use any
>>> configured external 3-way merge tool when it's own 3-way merge ends
>>> with conflic
On Mon, April 12, 2010 at 10:04 am, "Stephan Beal"
wrote:
> On Mon, Apr 12, 2010 at 4:06 AM, verizon wrote:
>
>>I'm running fossil version [2255e4e3ba] 2009-12-20 02:58:18 UTC
>> on
>> UNIX (and linux) and am trying to import about 1 Gig of files (it's a
>> Linux
>> distribution and tool
2010/4/12 D. Richard Hipp :
>
> On Apr 12, 2010, at 12:48 PM, Johan Samyn wrote:
>>
>> It would be interesting to have Fossil automatically use any
>> configured external 3-way merge tool when it's own 3-way merge ends
>> with conflicts, so one can manually and visually solve them, instead
>> of ha
> Can anyone suggest a good 3-way graphical
> merger that I can use for
> testing (Mac or Linux).
SourceGear's DiffMerge is free and works on Mac
and Linux:
http://sourcegear.com/diffmerge/
Disclosure: I work for SourceGear. But still, DiffMerge
is free.
--
E
D. Richard Hipp wrote:
> On
On Apr 12, 2010, at 12:52 PM, D. Richard Hipp wrote:
> Can anyone suggest a good 3-way graphical merger that I can use for
> testing (Mac or Linux).
I have used DeltaWalker on Mac. Once installed it can be invoked with a command
line (or shell script line) such as
/Applications/DeltaWalker.
On Apr 12, 2010, at 12:52 PM, D. Richard Hipp wrote:
>
> On Apr 12, 2010, at 12:48 PM, Johan Samyn wrote:
>>
>> It would be interesting to have Fossil automatically use any
>> configured external 3-way merge tool when it's own 3-way merge ends
>> with conflicts, so one can manually and visually s
On Apr 12, 2010, at 12:48 PM, Johan Samyn wrote:
>
> It would be interesting to have Fossil automatically use any
> configured external 3-way merge tool when it's own 3-way merge ends
> with conflicts, so one can manually and visually solve them, instead
> of having to go to the sourcefiles. And I
2010/4/12 D. Richard Hipp :
>
> On Apr 12, 2010, at 10:48 AM, Wilson, Ronald wrote:
>
>>> Hello,
>>> is there some way to use vimdiff or a gui tool like meld for merging?
>>> I always end up with the automerged file after update that I have to
>>> edit by hand and that easily becomes messy on bigge
On Apr 12, 2010, at 10:48 AM, Wilson, Ronald wrote:
>> Hello,
>> is there some way to use vimdiff or a gui tool like meld for merging?
>> I always end up with the automerged file after update that I have to
>> edit by hand and that easily becomes messy on bigger changes. I am
>> used to perforce
> Hello,
> is there some way to use vimdiff or a gui tool like meld for merging?
> I always end up with the automerged file after update that I have to
> edit by hand and that easily becomes messy on bigger changes. I am
> used to perforce 3-way merge or the .THIS, .OTHER, .BASE files in
> bazaar.
Hello,
is there some way to use vimdiff or a gui tool like meld for merging?
I always end up with the automerged file after update that I have to
edit by hand and that easily becomes messy on bigger changes. I am
used to perforce 3-way merge or the .THIS, .OTHER, .BASE files in
bazaar. The only way
For this exercise permissions are not important (the distribution is originally
(before import) copied to my directory and is rw by me). I don't think I've
hit the 1 G limit since the while the distribution is 1 G it is made of
thousands of files so no one thing is all that large.
--ji
On Mon, Apr 12, 2010 at 4:06 AM, verizon wrote:
>I'm running fossil version [2255e4e3ba] 2009-12-20 02:58:18 UTC on
> UNIX (and linux) and am trying to import about 1 Gig of files (it's a Linux
> distribution and tool set for a propriety system).
>
Fossil lacks several features which mak
17 matches
Mail list logo
