[Top][All Lists]

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

[Monotone-devel] Re: Undo a commit

From: Ludovic Brenta
Subject: [Monotone-devel] Re: Undo a commit
Date: Fri, 10 Oct 2008 16:31:11 +0200
User-agent: Internet Messaging Program (IMP) 3.2.2

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.

reply via email to

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