fonseca@antimatter:~/src/elinks/0.11/src > vi document/dom/node.c
fonseca@antimatter:~/src/elinks/0.11/src > cg diff
fonseca@antimatter:~/src/elinks/0.11/src > cg commit
Committed as 5ef041c051e1b286b1af3fbde80593d510eab95b.
fonseca@antimatter:~/src/elinks/0.11/src > cg push
2.11 BSD UNIX (machine.z.net) (ttyl1)
error: remote 'refs/heads/master' object 13f4464151f96d91831dedaf99f64541a801836c does not exist on local
fonseca@antimatter:~/src/elinks/0.11/src > cg update
This command can be ran only from the project root
fonseca@antimatter:~/src/elinks/0.11/src > cd ..
fonseca@antimatter:~/src/elinks/0.11 > cg update
Fetching pack (head and objects)...
2.11 BSD UNIX (machine.z.net) (ttyl1)
Packing 66 objects
Unpacking 66 objects
 100% (66/66) done
Fetching tags...
2.11 BSD UNIX (machine.z.net) (ttyl1)
Tree change: 5ef041c051e1b286b1af3fbde80593d510eab95b:13f4464151f96d91831dedaf99f64541a801836c
M po/fr.po
M src/document/dom/node.c
M src/network/connection.c
M src/protocol/bittorrent/connection.c
M src/session/session.c
M src/viewer/text/draw.c
M src/viewer/text/form.c
M src/viewer/text/link.c

Applying changes...
Fast-forwarding 2eebef098d922a9136652ee0385170b430da4aac -> 13f4464151f96d91831dedaf99f64541a801836c
        on top of 5ef041c051e1b286b1af3fbde80593d510eab95b...
Warning: uncommitted local changes, trying to bring them forward
patching file src/document/dom/Makefile
patching file src/document/dom/node.c
patching file test/css/selectors.html
fonseca@antimatter:~/src/elinks/0.11/src > cg log -r 5ef041c^..5ef041c | cat
commit 5ef041c051e1b286b1af3fbde80593d510eab95b
tree 74f5e11eb7dea7625a9e458b0258099712f03403
parent 2eebef098d922a9136652ee0385170b430da4aac
author Jonas Fonseca <fonseca@diku.dk> Tue, 13 Dec 2005 20:08:58 +0100
committer Jonas Fonseca <fonseca@antimatter.localdomain> Tue, 13 Dec 2005 20:08:58 +0100

    Redo the assertm() message to just show the type of the node and parent

fonseca@antimatter:~/src/elinks/0.11/src >
fonseca@antimatter:~/src/elinks/0.11/src > cg log -r 5ef041c^..5ef041c | cat
fonseca@antimatter:~/src/elinks/0.11/src > cd ..
fonseca@antimatter:~/src/elinks/0.11 > cg merge 5ef041c051e1b286b1af3fbde80593d510eab95b
Merging 2eebef098d922a9136652ee0385170b430da4aac -> 5ef041c051e1b286b1af3fbde80593d510eab95b
        to 13f4464151f96d91831dedaf99f64541a801836c...
fatal: Entry 'src/document/dom/node.c' not uptodate. Cannot merge.
cg-merge: git-read-tree failed (merge likely blocked by local changes)
fonseca@antimatter:~/src/elinks/0.11 > cg diff
fonseca@antimatter:~/src/elinks/0.11 > cg restore -f src/document/dom/node.c
Restoring file src/document/dom/node.c
fonseca@antimatter:~/src/elinks/0.11 > cg merge 5ef041c051e1b286b1af3fbde80593d510eab95b
Merging 2eebef098d922a9136652ee0385170b430da4aac -> 5ef041c051e1b286b1af3fbde80593d510eab95b
        to 13f4464151f96d91831dedaf99f64541a801836c...

Committed as 87c8a5cee4210a5c0ffa4dcdad41301f2fb8e55d.
src/document/dom/Makefile: locally modified
test/css/selectors.html: locally modified
fonseca@antimatter:~/src/elinks/0.11 > cg diff
fonseca@antimatter:~/src/elinks/0.11 > cg push
2.11 BSD UNIX (machine.z.net) (ttyl1)
updating 'refs/heads/master'
  from 13f4464151f96d91831dedaf99f64541a801836c
  to   87c8a5cee4210a5c0ffa4dcdad41301f2fb8e55d
Packing 9 objects
Unpacking 9 objects
 100% (9/9) done
chmod: changing permissions of `/srv/git/elinks.git/refs/heads/master': Operation not permitted
refs/heads/master: 13f4464151f96d91831dedaf99f64541a801836c -> 87c8a5cee4210a5c0ffa4dcdad41301f2fb8e55d
fonseca@antimatter:~/src/elinks/0.11 > cg-diff -p -r 5ef041 | cat
diff --git a/src/document/dom/node.c b/src/document/dom/node.c
index 785cf62..87d41b6 100644
--- a/src/document/dom/node.c
+++ b/src/document/dom/node.c
@@ -236,9 +236,8 @@ init_dom_node_(unsigned char *file, int
                int sort = (type == DOM_NODE_ATTRIBUTE);
                int index;

-               assertm(list, "Adding node to bad parent",
-                       get_dom_node_type_name(node->type),
-                       get_dom_node_type_name(parent->type));
+               assertm(list, "Adding node %d to bad parent %d",
+                       node->type, parent->type);

                index = *list && (*list)->size > 0 && sort
                      ? get_dom_node_map_index(*list, node) : -1;

fonseca@antimatter:~/src/elinks/0.11 >