On Thu, Nov 30, 2006 at 09:48:24PM -0000, Boris wrote: > Thanks again for all your explanations! Just one question I have here. In > 'diff -r <base> -r h:' you wanted to refer with <base> to the current > revision in workspace, right? I just ask to get the terminology right.
Yes, the revision last checked out or updated to or committed in this workspace, minus any local changes (which we already said we were assuming there weren't any). If you did have local changes, the terminology about "the current revision in the workspace" is less correct. Base would be the parent of that (uncommitted) revision which includes the local changes in the workspace. If you do a "mtn status" it's shown as the parent in "changes against parent", if you do a "mtn auto get_revision" it's shown as the old_revision, and it would be the ancestor of any new revision if you were to commit local changes now. -- Dan.
pgpJk2EkLtoTJ.pgp
Description: PGP signature
_______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
