Export to GitHub

majortom - issue #61

merge_in results in several revisions not on revision with several changes in the changeset

Posted on Sep 21, 2010 by Swift Lion

What steps will reproduce the problem? 1. tm1.merge_in(tm2)

What is the expected output? What do you see instead? one revision with a changeset inluding several changes that describe what happened during merge. Instead: several revisions.

Comment #1

Posted on Feb 18, 2011 by Happy Bear

(No comment was entered for this change.)

Comment #2

Posted on Apr 4, 2011 by Happy Bear

all changes of an merge in command are stored within one association

Status: Fixed

Labels:
Type-Defect Priority-Medium Database Milestone-1.2.0