Selon Daniel Carrera <[EMAIL PROTECTED]>:
> Hi Thomas. I tried this and it looks like the diff/patch step is 
> unnecessary - and indeed, if you run patch you actually break the 
> workspace. It appears that 'mtn revert .' is enough to solve the
> problem with kill_rev_locally.

Only partially; in your test you lost the fact that you added file
"asdf":

> % mtn add asdf
> mtn: adding asdf to workspace manifest
[...]
> % mtn revert .
[...]
> % mtn db kill_rev_locally 3be3ed81bd01509d0c1e2db46e987b1040bbc222
> mtn: applying changes from 3be3ed81bd01509d0c1e2db46e987b1040bbc222 on
> the current workspace
> % mtn status
> Current branch: foo.sandbox.branch
> Changes against parent 9f79e6063616d8fb85cad56253e39c2c49927899
>    patched  foo

Now you have to "mtn add" the new file again.

-- 
Ludovic Brenta.


_______________________________________________
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/monotone-devel

Reply via email to