* Cogito: Merge failure when new remote has been added locally
@ 2005-10-14 1:06 Horst von Brand
0 siblings, 0 replies; only message in thread
From: Horst von Brand @ 2005-10-14 1:06 UTC (permalink / raw)
To: git
I've set up an example project to play around with cogito/git. To simulate
patches flowing back and forth I set up several repositories, which I edit
independently. In this I run into trouble with a reasonable scenario:
A creates a project, and publishes it
B gets A's version, updates his version, and ships a patch (which creates
stack.h) to A
A merges in B's changes, and fixes a typo in stack.h
B tries to update from A via cg-update, the merge fails because there is a
local stack.h (which is different than the remote one). The resulting
message is less than helpful.
A script showing the problem follows:
mkdir tst1
cd tst1
echo "Initial" | cg-init
cd ..
cg-clone tst1 tst2
cd tst2
echo 'Hello!' > greet
cg-add greet
cg-commit -m "Add greet"
cd ../tst1
echo 'Hi there!' > greet
cg-add greet
cg-commit -m "Add greet"
cd ../tst2
cg-update
This gives:
MERGE ERROR: : Not handling case -> ->
Conflicts during merge. Do cg-commit after resolving them.
And there is nothing marked to fix by hand. cg-diff returns an empty
difference in greet.
--
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-10-14 1:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-10-14 1:06 Cogito: Merge failure when new remote has been added locally Horst von Brand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).