Re: [Monotone-devel] Re: Undo a commit

[Thomas Keller]

Daniel Carrera schrieb:
> Bruce Stephens wrote:
>>> Help?
>>
>> I think disapprove *only* changes the database.  You need to do "mtn
>> update" to change your workspace.
> 
> 
> Ok, I did that. It seems to work, but it also gave me a scary warning.
> For background, the commit that I wanted to remove was the addition of
> several directories with files in them. This is what mtn said:
> 
> % mtn update
> mtn: updating along branch 'org.theingots'
> mtn: selected update target d02074eb70d2bdfe99fc82cc8c35a8c2c2b2ad98
> mtn: [left]  9198ce86d4f514bcf9cc613d170befd65a0ed7b4
> mtn: [right] d02074eb70d2bdfe99fc82cc8c35a8c2c2b2ad98
> mtn: warning: cannot drop non-empty directory 'certification'
> mtn: warning: cannot drop non-empty directory 'certification/include'
> mtn: warning: cannot drop non-empty directory 'certification/include/php'
> mtn: warning: cannot drop non-empty directory
> 'certification/templates/moderator'
> mtn: misuse: 4 workspace conflicts
> 
> 
> I don't like the sound of that. Especially the "misuse" line. I can
> verify with darcs that Monotone didn't break anything. But why did
> monotone say that I'm misusing it and that I have conflicts?

This is something we hopefully remove in the next release. Just move the
certification/ directory out of the way so monotone can cleanly update
your workspace to the previous revision.

Thomas.

-- 
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature