Situation:- 2 branches with slightly different explorations of the same codebase (where 1 may not yet exist )
- 1 'main branch' which is ahead of those 2.
Goal: partial propagation of main into both$ mtn explicit_merge `mtn automate select t:checkpoint` `mtn automate heads` com.hsdev.firstbranch
mtn: [source] 02e5eac1c7cbf4da455a2fa5df02746ea0813fa6 mtn: [source] 525e9570017382fb6fe7a3bf3ceb10c7b6241d03 mtn: [merged] a3a93b1ea2ab476084ff425d58e90e2697b53890$ mtn explicit_merge `mtn automate select t:checkpoint` `mtn automate heads` com.hsdev.secondbranch
mtn: [source] 02e5eac1c7cbf4da455a2fa5df02746ea0813fa6 mtn: [source] 525e9570017382fb6fe7a3bf3ceb10c7b6241d03mtn: fatal: std::logic_error: ../database.cc:1533: invariant 'I(! revision_exists(new_id))' violated
I assume it tries to create the same a3a93... rev.Couldn't monotone recognize "oh, it's already there, lets put the cert on it then" or am I doing something wrong?
marcel -- Marcel van der Boom HS-Development BV -- http://www.hsdev.com So! webapplicatie framework -- http://make-it-so.info
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel