On Sun, Jan 15, 2006 at 04:21:57PM -0500, Yury Polyanskiy wrote: > I'm rephrasing my last question. > > I have a tree at some state. If I want to commit it as a child to ONE > revision I simply do echo $REVISION >MT/revision; monotone commit. > > Now HOW to commit a tree as a child to TWO revisions? I.e. I want > current revision to be a child of revA and revB (as if it were a merge, > though I did all merging already and don't need any monotone merge > assistance).
Two further options, neither quite as elegant as we might like: - do a merge (or explicit_merge) of the revisions in question, overriding the lua merge-assistance hooks to supply the merged content for each file from a separate location where you've done your manual merging work. - commit your manually edited revision twice, once as a child of each revision, then merge those new heads. -- Dan.
pgpGhH5LKpJDi.pgp
Description: PGP signature
_______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
