[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-devel] Monotone update failures...

From: J Decker
Subject: [Monotone-devel] Monotone update failures...
Date: Thu, 24 Apr 2008 11:33:25 -0700

Create a branch... check it out

add a directory
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: target revision is not in current branch
mtn.EXE: switching to branch branch
mtn.EXE: warning: cannot drop non-empty directory 'include/internal'
<whatever added directory was>
mtn.EXE: misuse: 1 workspace conflicts

was going to further do...

mtn add the_other_file

(I creted both files, but one was not ready for the main branch, so I
commited that on a second branch, the other I wanted to put back in
the first branch...)

probably would end up with some sort of non-content conflict like
adding include/internal directory 2x ... killing possiblity of

reply via email to

[Prev in Thread] Current Thread [Next in Thread]