view tests/test-issue612.out @ 12023:44c22dc193a4

revlog.addrevision(): move computation of nodeid in addrevision()

The check "if node in nodemap" is already done earlier in addgroup().

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o