Re: bzr repository ready?

[Andreas Schwab <schwab@suse.de>]

Karl Fogel <kfogel@red-bean.com> writes:

> In the CVS tree, we have this change to lisp/cus-start.el:
>
>    ----------------------------
>    revision 1.50.2.39
>    date: 2008-06-12 01:34:43 -0400;  author: miles;  state: Exp; \
>    lines: +0 -45;  commitid: AfSvpHSiE9VuuC6t;
>    Merge from emacs--devo--0
>    
>    Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-88
>    ----------------------------
>
> That's on the 'lexbind' branch.  That change was part of a commit to
> many files.  I'm using a verbose cvs2cl.pl-generated ChangeLog (see
> http://www.red-bean.com/kfogel/emacs-bzr-switchover/cvs2cl-ChangeLog) to
> pick changes to spot-check, and it shows how the above is part of a
> larger change (note we're in UTC this time):
>
>    2008-06-12 05:34  miles
>
>         * lisp/cus-start.el, lisp/finder.el, lisp/window.el,
>         lisp/ChangeLog, lisp/bindings.el, lisp/ffap.el, lisp/menu-bar.el,
>         lisp/vc-cvs.el, lisp/longlines.el, lisp/vc.el, lisp/Makefile.in,
>         lisp/help-fns.el, lisp/help.el, lisp/replace.el,
>         doc/misc/gnus.texi, lisp/mail/sendmail.el, lisp/nxml/nxml-mode.el,
>         lisp/nxml/nxml-rap.el, lisp/nxml/nxml-util.el, doc/misc/ChangeLog,
>         src/data.c, src/window.c, src/buffer.c, src/window.h, src/coding.c,
>         src/ChangeLog, src/dispnew.c, src/xdisp.c, src/lisp.h,
>         lisp/gnus/ChangeLog, lisp/gnus/gnus-art.el, lisp/gnus/gnus-util.el,
>         lisp/gnus/nnir.el, lisp/gnus/mm-decode.el,
>         lisp/language/hanja-util.el, leim/quail/hangul.el, etc/NEWS
>         (lexbind.[39,19,36,224,57,29,50,33,32,68,48,57,54,65,13,32,8,5,5,\
>                   20,47,92,73,21,59,203,55,140,77,138,76,37,2,39,3,12,176]):
>
>         Merge from emacs--devo--0
>
>         Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-88
>
> For those new to cvs2cl.pl: the "(lexbind.[NUMBER,NUMBER,...])" at the
> end shows the branch name and then, for each listed file in order, the
> revision number of file's corresponding change on that branch.  You can
> see that the "39" matches the "1.50.2.39" in the 'cvs log' output, and
> 'cvs log' confirms that "1.50.0.2" is the branch number for "lexbind"
> (ignore the intermediate ".0", it's just a CVS idiosyncracy).  You can
> use 'cvs2cl.pl -b -r -t -S --utc' to generate this data yourself.
>
> So: given that this change exists as a discrete commit in CVS, I'd
> expect it to show up somewhere in the 'bzr log --long' output (see
> http://www.red-bean.com/kfogel/emacs-bzr-switchover/bzr-log.out).

This change is part of a merge commit that did not contribute anything
on its own (ie. there were no conflicts).  The changes it introduces are
identical in the merged branches, so there is no point in duplicating
the history that is already present in the merge parent.  In other
words, these two commands produce identical output:

git diff d38470869..d38470869^ -- lisp/cus-start.el
git diff d38470869^2..d38470869^^2 -- lisp/cus-start.el

The first gives the changes relative to the last merge commit on the
lexbind branch, the latter the changes between the last two merge
parents on the master branch.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."