On Thu, Oct 05, 2006 at 04:43:42PM +1000, Daniel Carosone wrote: > On Wed, Oct 04, 2006 at 11:26:40PM -0700, Dmitry Kakurin wrote: > > Why is it complaining ? Is it because of CS dir name collision ? Can I > > tell mtn what I want to happen ? > > yes, and also the "" (root) dir name collision. > > I suggest something roughly like the following: > > mtn co -b org.foo.proj1 > mtn co -b org.foo.proj2 > cd org.foo.proj2 > mtn mv -e CS/proj2 proj2 > mtn drop CS
doh! I missed: mtn pivot_root proj2 oldroot mtn drop oldroot > mtn commit > mtn merge_into_dir org.foo.proj2 org.foo.proj1 CS/proj2 > cd ../org.foo.proj1 > mtn up > > At that point, you might want to start new commits from there on as a > new more general branch name. > > If this works for you, please let us know - and perhaps write up more > detailed notes on the process as a wiki page? > > -- > Dan. > _______________________________________________ > Monotone-devel mailing list > Monotone-devel@nongnu.org > http://lists.nongnu.org/mailman/listinfo/monotone-devel
pgpTYWepessbT.pgp
Description: PGP signature
_______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
