Justin Patrin [EMAIL PROTECTED] writes:
It says it right up there in the doc you quoted.
...in such a way that propagate can be used to keep the contained
project up-to-date.
Meaning if you propagate as above it will propagate into the dir.
Sorry, yes, that part does seem obvious per the
On Thu, Dec 07, 2006 at 07:58:29AM -0800, Steven E. Harris wrote:
Say I use merge_into_dir as discussed, get the files on the target
prototype branch in a new directory (experiment), then decide I
want to start moving them around within the tree. Maybe I move
/experiment/one.txt to /six.txt:
Justin Patrin [EMAIL PROTECTED] writes:
Monotone won't see any relationship until you merge one into the
other. Then it will get a mege conflict when you try to merge them
as they're named the same but do no share any ancestry. This is if
you simply merge them as-is, though.
[...]
Thank
Justin Patrin [EMAIL PROTECTED] writes:
One way to merge these would be to use merg_into_dir. This allows
you to merge one branch's root into a directory in another
branch. So you'd do:
mtn --db=db.MTN merge_into_dir project.experiment project.prototype experiment
The merge_into_dir
In message [EMAIL PROTECTED] on Wed, 06 Dec 2006 15:34:49 -0800, Steven E.
Harris [EMAIL PROTECTED] said:
seh If I used merge_into_dir as you suggested, placing the root of the
seh project.experiment branch into the ./experiment directory of the
seh project.prototype branch, what would happen
