[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: Re: Using monotone in a team
From: |
Boris |
Subject: |
[Monotone-devel] Re: Re: Using monotone in a team |
Date: |
Thu, 30 Nov 2006 21:48:24 -0000 |
Daniel Carosone wrote:
> [...]
> h: is a selector for "the heads of a branch", and defaults to the
> current branch of not named. After a sync, new heads may have
> arrived, and hence you are considering an update and want to find out
> what it will do.
>
> Giving diff one -r argument takes the diff between the current
> workspace and that revision (rather than the base). So if you have no
> uncomitted changes, the result is what I described: a diff that shows
> what your workspace has 'undone' from the (new) head, or in other
> words a reversed diff of the changes an update would apply.
>
> If you new your base revision, you could get the diff you really
> wanted with diff -r <base> -r h:, it's just that we don't have a
> simple generic way to refer to <base> other than by knowing it in
> advance. Adding that is one of the Quickie Tasks a new contributor
> could start with.
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.
Boris
- [Monotone-devel] Re: Re: Using monotone in a team, (continued)
- [Monotone-devel] Re: Re: Using monotone in a team, Boris, 2006/11/30
- Re: [Monotone-devel] Re: Re: Using monotone in a team, Daniel Carosone, 2006/11/30
- Re: [Monotone-devel] Re: Re: Using monotone in a team, Hugo Cornelis, 2006/11/30
- [Monotone-devel] Re: Re: Re: Using monotone in a team, Boris, 2006/11/30
- Re: [Monotone-devel] Re: Re: Re: Using monotone in a team, Timothy Brownawell, 2006/11/30
- [Monotone-devel] Re: Re: Re: Re: Using monotone in a team, Boris, 2006/11/30
- Re: [Monotone-devel] Re: Re: Re: Re: Using monotone in a team, Timothy Brownawell, 2006/11/30
- Re: [Monotone-devel] Re: Re: Using monotone in a team, Daniel Carosone, 2006/11/30
[Monotone-devel] Re: Using monotone in a team, Boris, 2006/11/30
[Monotone-devel] Using monotone in a team, Boris, 2006/11/29