From: Uday S Reddy <u.s.reddy@cs.bham.ac.uk>
To: emacs-devel@gnu.org
Subject: Re: Please don't use revision numbers on commit messages (and elsewhere).
Date: Sun, 03 Apr 2011 09:00:38 +0100 [thread overview]
Message-ID: <in99f7$v1n$1@dough.gmane.org> (raw)
In-Reply-To: <87hbagsr1x.fsf@wanadoo.es>
On 4/2/2011 2:47 PM, Óscar Fuentes wrote:
>
>> The branch-local-revision is the localized version of the revision
>> number, i.e., 1 = 11-10, 2 = 12-10, ...
>>
>> So, doing that bit of arithmetic is all it takes to decode "revision 11".
>
> Yes, that works as long as those commits are merged in the same
> operation.
I think it always works independent of how you merge. The local
revision 11 will always be 10.x.1 and local revision 12 will always be
10.x.2. Whether you merge in one steps or multiple steps doesn't make a
difference.
> But even on that case we would be better without the arithmetic. Think a
> feature branch with dozens or hundreds of commits. And I'm not talking
> just about commit messages. References on bug reports or e-mail
> exchanges suffer from the same.
In that case, you are talking about a tradeoff, what will be easier to
the committer versus what will be easier for somebody to analyze things
later on. My feeling is that committing is done much more often and
doing additional chores in the middle of committing is distracting. So
I would want to make it easier for committing.
If one states the branch nickname and the original revision id on the
branch, then it can always be found on the trunk after merging. You can
find the branch nickname in the log and then do the little bit of
arithmetic to find the right revision.
When bug reports are submitted for a branch, the Emacs reporter should
be including the branch nickname as part of the version information (if
it isn't doing so already). That would ensure that the context is included.
> My branch log doesn't show the revnos of trunk as they are on trunk, but
> some renumbered version. As you mention, I can start counting merged
> revisions across merge points until reaching the referenced revision,
> but that's impractical.
Every revision is marked by the branch nick(name) and a revision number.
If the branch nick is stated as "trunk" for a top-level revision then
it is the revision number on the trunk. Otherwise, it is your local
revision which would again be identified by your branch nick.
There is no counting involved. A maximum of one addition or subtraction.
And, it should also be easy enough to write an Emacs command or two to
automate it.
Cheers,
Uday
next prev parent reply other threads:[~2011-04-03 8:00 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 20:47 Please don't use revision numbers on commit messages (and elsewhere) Óscar Fuentes
2011-03-31 21:36 ` Lennart Borgman
2011-03-31 21:53 ` Óscar Fuentes
2011-03-31 21:59 ` Lennart Borgman
2011-03-31 22:06 ` Óscar Fuentes
2011-03-31 22:18 ` Lennart Borgman
2011-03-31 22:58 ` Juanma Barranquero
2011-04-01 7:42 ` Eli Zaretskii
2011-04-01 7:58 ` Andreas Schwab
2011-04-01 8:02 ` Eli Zaretskii
2011-04-01 8:17 ` Andreas Schwab
2011-04-01 8:42 ` Eli Zaretskii
2011-04-01 8:54 ` Andreas Schwab
2011-04-01 10:11 ` Eli Zaretskii
2011-04-01 10:21 ` Andreas Schwab
2011-04-01 10:48 ` Eli Zaretskii
2011-04-01 11:18 ` Andreas Schwab
2011-04-01 13:15 ` Eli Zaretskii
2011-04-01 13:32 ` Andreas Schwab
2011-04-01 13:47 ` Eli Zaretskii
2011-04-01 13:51 ` Deniz Dogan
2011-04-01 15:26 ` Óscar Fuentes
2011-04-01 19:13 ` Eli Zaretskii
2011-04-01 20:17 ` Óscar Fuentes
2011-03-31 23:14 ` Juanma Barranquero
2011-04-01 0:11 ` Óscar Fuentes
2011-04-01 0:28 ` Juanma Barranquero
2011-04-01 1:20 ` Óscar Fuentes
2011-04-01 8:18 ` Eli Zaretskii
2011-04-01 12:08 ` David Kastrup
2011-04-01 13:15 ` Eli Zaretskii
2011-04-01 15:35 ` Óscar Fuentes
2011-04-01 19:52 ` Eli Zaretskii
2011-04-01 20:04 ` David Kastrup
2011-04-01 20:36 ` Eli Zaretskii
2011-04-01 20:43 ` Óscar Fuentes
2011-04-01 10:34 ` Juanma Barranquero
2011-04-01 15:55 ` Óscar Fuentes
2011-04-01 21:53 ` Juanma Barranquero
2011-04-04 16:32 ` Nils Ackermann
2011-04-04 21:27 ` Juanma Barranquero
2011-04-04 21:36 ` Lennart Borgman
2011-04-04 21:49 ` Juanma Barranquero
2011-04-04 22:03 ` Lennart Borgman
2011-04-04 22:09 ` Juanma Barranquero
2011-04-04 22:27 ` Stefan Monnier
2011-04-04 22:35 ` Juanma Barranquero
2011-04-05 21:00 ` Thien-Thi Nguyen
2011-04-05 21:00 ` Thien-Thi Nguyen
2011-04-06 1:30 ` Stefan Monnier
2011-04-06 2:55 ` Stephen J. Turnbull
2011-04-06 12:47 ` Thien-Thi Nguyen
2011-04-01 1:59 ` Stephen J. Turnbull
2011-04-01 10:00 ` Uday S Reddy
2011-04-01 15:00 ` Stephen J. Turnbull
2011-04-01 16:38 ` Uday S Reddy
2011-04-01 18:08 ` Stephen J. Turnbull
2011-04-01 18:56 ` Uday S Reddy
2011-04-01 20:49 ` Stephen J. Turnbull
2011-04-01 10:45 ` Juanma Barranquero
2011-04-01 14:51 ` Stefan Monnier
2011-04-01 15:14 ` Ted Zlatanov
2011-04-01 19:58 ` Juanma Barranquero
2011-04-02 2:12 ` Chong Yidong
2011-04-01 1:35 ` Stephen J. Turnbull
2011-04-01 10:39 ` Juanma Barranquero
2011-03-31 23:16 ` Thien-Thi Nguyen
2011-04-01 0:20 ` Óscar Fuentes
2011-04-01 8:38 ` Thien-Thi Nguyen
2011-04-01 9:36 ` Eli Zaretskii
2011-04-01 10:14 ` Eli Zaretskii
2011-04-01 17:38 ` Thien-Thi Nguyen
2011-04-01 15:38 ` Óscar Fuentes
2011-04-01 19:12 ` Eli Zaretskii
2011-04-01 20:21 ` Óscar Fuentes
2011-04-01 20:38 ` Eli Zaretskii
2011-04-01 21:40 ` Uday S Reddy
2011-04-02 0:03 ` Óscar Fuentes
2011-04-02 6:20 ` Uday S Reddy
2011-04-02 13:47 ` Óscar Fuentes
2011-04-03 8:00 ` Uday S Reddy [this message]
2011-04-03 16:13 ` Óscar Fuentes
2011-04-04 9:29 ` Uday S Reddy
2011-04-05 2:20 ` Stephen J. Turnbull
2011-04-02 2:57 ` Stephen J. Turnbull
2011-04-01 0:55 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='in99f7$v1n$1@dough.gmane.org' \
--to=u.s.reddy@cs.bham.ac.uk \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).