public inbox for gentoo-user@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-user]  [OT] File merge tool
@ 2009-07-22 19:49 Harry Putnam
  2009-07-23  4:35 ` Roy Wright
  0 siblings, 1 reply; 6+ messages in thread
From: Harry Putnam @ 2009-07-22 19:49 UTC (permalink / raw
  To: gentoo-user

Summary:
Any suggestions for a file merge tool?

Details:

I'd like to try just actually manually merging bookmarks.html files
from different computers.  Diff and Patch seem kind of hard or maybe
impossible to use for this.

If you have identical parts in different places they will just keep
adding up... no way to weed out duplication.

If there anything that can do that or at least help me do it.

I'm not talking about bookmark merge/storage things like Xmarks or
foxmarks.   My files are not so large that I couldn't do it by hand
but would need some smart helper tool. 





^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [gentoo-user]  [OT] File merge tool
  2009-07-22 19:49 [gentoo-user] [OT] File merge tool Harry Putnam
@ 2009-07-23  4:35 ` Roy Wright
  2009-07-23  8:27   ` Justin
  2009-07-25 15:00   ` Harry Putnam
  0 siblings, 2 replies; 6+ messages in thread
From: Roy Wright @ 2009-07-23  4:35 UTC (permalink / raw
  To: gentoo-user

kdiff3 is my favorite graphical merge tool (hey, even have it running  
on my macbook).

On Jul 22, 2009, at 2:49 PM, Harry Putnam wrote:

> Summary:
> Any suggestions for a file merge tool?
>
> Details:
>
> I'd like to try just actually manually merging bookmarks.html files
> from different computers.  Diff and Patch seem kind of hard or maybe
> impossible to use for this.
>
> If you have identical parts in different places they will just keep
> adding up... no way to weed out duplication.
>
> If there anything that can do that or at least help me do it.
>
> I'm not talking about bookmark merge/storage things like Xmarks or
> foxmarks.   My files are not so large that I couldn't do it by hand
> but would need some smart helper tool.
>
>
>




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [gentoo-user]  [OT] File merge tool
  2009-07-23  4:35 ` Roy Wright
@ 2009-07-23  8:27   ` Justin
  2009-07-25 15:13     ` [gentoo-user] " Harry Putnam
  2009-07-25 15:00   ` Harry Putnam
  1 sibling, 1 reply; 6+ messages in thread
From: Justin @ 2009-07-23  8:27 UTC (permalink / raw
  To: gentoo-user

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

Roy Wright schrieb:
> kdiff3 is my favorite graphical merge tool (hey, even have it running on
> my macbook).
> 
> On Jul 22, 2009, at 2:49 PM, Harry Putnam wrote:
> 
>> Summary:
>> Any suggestions for a file merge tool?
>>
>> Details:
>>
>> I'd like to try just actually manually merging bookmarks.html files
>> from different computers.  Diff and Patch seem kind of hard or maybe
>> impossible to use for this.
>>
>> If you have identical parts in different places they will just keep
>> adding up... no way to weed out duplication.
>>
>> If there anything that can do that or at least help me do it.
>>
>> I'm not talking about bookmark merge/storage things like Xmarks or
>> foxmarks.   My files are not so large that I couldn't do it by hand
>> but would need some smart helper tool.
>>
>>
>>
> 
> 

Along time I used tkdiff and it worked really fine, since yesterday I
swapped to the new package diffuse, which is actually the same in gtk.

justin


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-user]  Re: [OT] File merge tool
  2009-07-23  4:35 ` Roy Wright
  2009-07-23  8:27   ` Justin
@ 2009-07-25 15:00   ` Harry Putnam
  2009-07-26  8:29     ` Stroller
  1 sibling, 1 reply; 6+ messages in thread
From: Harry Putnam @ 2009-07-25 15:00 UTC (permalink / raw
  To: gentoo-user

Roy Wright <roy@wright.org> writes:

> kdiff3 is my favorite graphical merge tool (hey, even have it running
> on my macbook).
>
Thanks.. I'm pretty sure that would involve installing some part of
kde which I'm not interested in doing.  Just too much grind time when
updating and not that much in return.





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-user]  Re: [OT] File merge tool
  2009-07-23  8:27   ` Justin
@ 2009-07-25 15:13     ` Harry Putnam
  0 siblings, 0 replies; 6+ messages in thread
From: Harry Putnam @ 2009-07-25 15:13 UTC (permalink / raw
  To: gentoo-user

Justin <justin@j-schmitz.net> writes:

>
> Along time I used tkdiff and it worked really fine, since yesterday I
> swapped to the new package diffuse, which is actually the same in gtk.

Now that does look usefull.

Too bad I see no way to ignore differences in dates of the various
entries.   That seems to occur in many many places.

But the tool seems really usefull.  Thanks




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [gentoo-user]  Re: [OT] File merge tool
  2009-07-25 15:00   ` Harry Putnam
@ 2009-07-26  8:29     ` Stroller
  0 siblings, 0 replies; 6+ messages in thread
From: Stroller @ 2009-07-26  8:29 UTC (permalink / raw
  To: gentoo-user


On 25 Jul 2009, at 16:00, Harry Putnam wrote:
> Roy Wright <roy@wright.org> writes:
>
>> kdiff3 is my favorite graphical merge tool (hey, even have it running
>> on my macbook).
>>
> Thanks.. I'm pretty sure that would involve installing some part of
> kde which I'm not interested in doing.  Just too much grind time when
> updating and not that much in return.

Have you actually tried --pretend emerging it?

Correct package name is kde-misc/kdiff3

Stroller.



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-07-26  8:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-22 19:49 [gentoo-user] [OT] File merge tool Harry Putnam
2009-07-23  4:35 ` Roy Wright
2009-07-23  8:27   ` Justin
2009-07-25 15:13     ` [gentoo-user] " Harry Putnam
2009-07-25 15:00   ` Harry Putnam
2009-07-26  8:29     ` Stroller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox