[Monotone-devel] Re: Monotone update failures...

[Marcin W. Dąbrowski]

Hi.

> add a 2 file in the directory
> mtn add one of the files
> mtn commit --branch=new.branch
> mtn update -r h:branch
> mtn.EXE: warning: cannot drop non-empty directory 'include/internal'
> <whatever added directory was>

I don't see anything weird here. Monotone works as expected.

The diff between 'new.branch' and 'branch' orders to drop the
directory added in 'new.branch', but there's a unmanaged file
in it. So, it can't drop the dir - it's not empty...

> was going to further do...
> mtn add the_other_file
> probably would end up with some sort of non-content conflict...

It would - on both branches a new dir with the same name was added.

The solution is to add one more step:

1. Create new directory, let's call this 'new-dir'.
2. mtn add new-dir
3. mtn ci -m "New dir in main branch.'
4. Now, you can add new files to that dir.

On my installation the following works as a charm. :)

mtn -d mtn.mtn db init
mtn -d mtn.mtn setup . -b branch-1
mkdir dir-1
mtn add dir-1
mtn ci -m "New dir in main branch"
echo empty > dir-1\file-1
echo empty > dir-1\file-2
mtn add dir-1\file-1
mtn ci -b branch-2 -m "Creating new branch."
mtn up -r h:branch-1

Regards,
-- 
mwd