| From: | Markus Schiltknecht <markus(at)bluegap(dot)ch> |
|---|---|
| To: | mark(at)mark(dot)mielke(dot)cc |
| Cc: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>, Alvaro Herrera <alvherre(at)commandprompt(dot)com>, Bruce Momjian <bruce(at)momjian(dot)us>, Gregory Stark <stark(at)enterprisedb(dot)com>, Warren Turkal <wt(at)penguintechs(dot)org>, pgsql-hackers(at)postgresql(dot)org |
| Subject: | Re: SCMS question |
| Date: | 2007-02-26 15:04:04 |
| Message-ID: | 45E2F6E4.9050202@bluegap.ch |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
Hi,
mark(at)mark(dot)mielke(dot)cc wrote:
> I'll have to try kdiff3 - but the "merge" command, although it often works,
> I strongly dislike when it marks up the lines as "there was a conflict here"
> and gives you three files in the directory to choose to start from. This is
> far too manual, which invites mistakes.
Agreed that this is somewhat annoying, but hey, it's a command line
tool. How else would you solve displaying conflicts?
> If kdiff3 is more like the ClearCase
> graphical merge utility, I would far prefer that. Can you say "I want change
> 2 followed by change 3" with checkboxes, a live final version to view, and
> the ability to manually type or adjust lines in the final version to view?
Yup. That's possible. And much much more... ;-) (I don't know the
ClearCase tool, so I can't really offer a comparison, sorry.)
Others you might want to try:
- meld (in python, IMO worse than kdiff3)
- xxdiff (I've never really used that one, but other monotone hackers
seem to like it as well)
Regards
Markus
| From | Date | Subject | |
|---|---|---|---|
| Next Message | RPK | 2007-02-26 15:30:12 | NPGSQL/ODBC performance |
| Previous Message | mark | 2007-02-26 14:57:07 | Re: SCMS question |