On Fri, Oct 12, 2007, Ralf S. Engelschall wrote:
> On Fri, Oct 12, 2007, Ralf S. Engelschall wrote:
> > On Thu, Sep 27, 2007, Ralf S. Engelschall wrote:
> > [...]
> > | mtn: fatal: std::logic_error: roster.cc:1808: invariant
> > 'I(left_uncommon_ancestors.find(left_rid) !=
> > left_uncommon_ancestors.end())' violated
> > [...]
>
> Ok, with the following small script...
>
> ------------------------------------------------------
> #!/bin/sh -x
> mtn=${1+/u/rse/prj/monotone/src/mtn}
> cd /tmp
> rm -f /tmp/test.db
> $mtn --db=/tmp/test.db db init
> rm -rf test
> mkdir test
> cd test
> $mtn --db=/tmp/test.db setup -b test
> echo "foo" >test.txt
> $mtn add test.txt
> $mtn ci -m "commit 1 (foo)"
> echo "bar" >test.txt
> $mtn ci -m "commit 2 (bar)"
> echo "baz" >test.txt
> $mtn ci -m "commit 3 (baz)" -b test.tmp
> echo "baz2" >test.txt
> $mtn ci -m "commit 4 (baz2)"
> $mtn up -r h:test
> MTN_MERGE=diffutils MTN_MERGE_DIFFUTILS=partial \
> $mtn merge_into_workspace h:test.tmp
> ------------------------------------------------------
And one more related bug: if you comment out the two lines...
$mtn ci -m "commit 2 (bar)"
echo "baz" >test.txt
...in the above script (so that the main branch has just a single
initial revision), another assertion fires:
mtn: fatal: std::logic_error: graph.cc:87: invariant 'I(!next.empty())'
violated
So, we have at least two major problems here which make
"merge_into_workspace" effectively totally broken and hence
unfortunately unusable :-(
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
