Selon Thomas Keller: > Ludovic Brenta schrieb: > > Selon Thomas Keller: > >> Ludovic Brenta schrieb: > >>> Or teach db kill_rev_locally to only change the workspace's parent > >>> revision without changing anything to the workspace? > >> This is what I meant with "workspace merge" - of course the parent > of > >> the current workspace no longer exists if it is killed, so > >> old_revision > >> gets rewritten to the parent of the killed revision. Then, the > killed > >> revision's changeset is merged (plucked?) into this altered > workspace. > > > > That last step is unnecessary because the workspace already contains > the > > changes in the killed revision. > > Right, wrong wording: its not merged into the altered workspace, but > into the workspace' _MTN/revision (after all f.e. a previously added > file has to be marked as "added" again there).
I don't see why; the altered _MTN/revision still contains the new manifest ID that has the new, moved or deleted files. Or am I missing something? -- Ludovic Brenta. _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
