Linus Torvalds wrote:
On Thu, 30 Nov 2006, Linus Torvalds wrote:
No, kdiff3 probably doesn't have the same semantics, so better get the
"real" merge. It's almost certainly in the rcs package, so "emerge rcs"
should do it.
..and just to be safe, remove the symlink first, so that you don't end up
overwriting the "kdiff3" binary by mistake when you install the real
"merge". Not that I think emerge is quite that stupid a package manager,
but anyway..
Linus
Ubuntu is debian based and I use Synaptic GUI, a front end to apt-get. My earlier problem
was I couldn't find which package "merge" was in. But now I just figured it out by going
to debian.org and using "Search the contents of packages" for "merge". Turns out "merge"
is in devel/rcs which of course the whole world knows, unless your a neophyte like me:)
Any way after getting the real merge, I reverted the first pull and re-did it and all was well:
wink@winkc2d1:~/linux/linux-2.6$ git-checkout -f
wink@winkc2d1:~/linux/linux-2.6$ git-status
# On branch refs/heads/ace
nothing to commit
wink@winkc2d1:~/linux/linux-2.6$ git-pull . master
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 0215ffb08ce99e2bb59eca114a99499a4d06e704
Merging:
d7083db038fb98266e331a7f96198ec35a12367a A partial fix BUG 061124 (crashing when 1ms interrrupts).
0215ffb08ce99e2bb59eca114a99499a4d06e704 Linux 2.6.19
found 1 common ancestor(s):
1abbfb412b1610ec3a7ec0164108cee01191d9f5 [PATCH] x86_64: fix bad page state in process 'swapper'
Auto-merging kernel/fork.c
Auto-merging kernel/spinlock.c
Merge made by recursive.
Documentation/rtc.txt | 463 ++++++++++++++++---------
Makefile | 2
arch/arm/configs/assabet_defconfig | 1
arch/arm/configs/cerfcube_defconfig | 1
arch/arm/configs/corgi_defconfig | 1
......
sound/pci/emu10k1/emu10k1_main.c | 1
sound/pci/hda/patch_realtek.c | 2
sound/pci/hda/patch_sigmatel.c | 14 -
sound/usb/usbaudio.c | 3
usr/Makefile | 2
92 files changed, 888 insertions(+), 371 deletions(-)
create mode 100644 arch/mips/kernel/topology.c
create mode 100644 arch/um/os-Linux/execvp.c
create mode 100644 include/asm-arm/mach/udc_pxa2xx.h
Thank you very much,
Wink
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html