From: Horst von Brand <vonbrand@inf.utfsm.cl>
Date: Sun, 23 Oct 2005 15:57:51 GMT
Subject: Merge failure problem with cogito: How to fixup?
Message-ID: <200510231557.j9NFvptA020919@inti.inf.utfsm.cl>

When doing the following:

   mkdir /tmp/tst1
   cd /tmp/tst1
   echo "Initial" | cg-init 
      
   cd /tmp
   cg-clone tst1 tst2
   
   cd /tmp/tst1
   echo 'Hi there!' > greet
   cg-add greet
   cg-commit -m "Add greet"
   
   cd /tmp/tst2
   echo 'Hello!' > greet
   cg-add greet
   cg-commit -m "Add greet"

   cg-update

I get a message to the end that the merge doesn't work, and that I have to
fix up by hand. The resulting greet file has no merge markers, plain
"cg-diff" is useless. How am I supposed to find out what the problem is?

Yes, "cg-diff -r origin:HEAD" does the trick, but...
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513