7:46 a.m.
Raymond Toy writes:
>>>> On Wed, Aug 21, 2013 at 9:37 AM, Stephen J. Turnbull,
XEmacs 21.5
>>>> Beta Engineer <stephen(a)xemacs.org> wrote:
> * XEmacs 21.5.34 "kale" is released.
> "kale" is the thirty-fifth in the VEGETABLE series.
This is great!
But exactly how do I get it?
You probably "really" want to do "hg co tip", but you should now be
able to see r21-5-34 == r21-5-latest-beta in the repo if you do hg
pull and hg log. To actually get the released code, do hg checkout
r21-5-34.
You probably don't want to look at "hg view", lest you spontaneously
combust. Mercurial's model of "versioned tags" when added to the
general dVCS problem of the impossibility of rewinding branches after
pushing, plus what may be an outright bug (after hg pull + hg merge +
hg commit, hg push tells me there are unsynced changes on remote) make
the history more than a little confusing.
Steve
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
1:14 a.m.
New subject: XEmacs 21.5.34 "kale" is released.
On 08/25/13 08:46, Stephen J. Turnbull wrote:
Raymond Toy writes:
>>>>> On Wed, Aug 21, 2013 at 9:37 AM, Stephen J. Turnbull, XEmacs 21.5
>>>>> Beta Engineer <stephen(a)xemacs.org> wrote:
>> * XEmacs 21.5.34 "kale" is released.
>> "kale" is the thirty-fifth in the VEGETABLE series.
> This is great!
> But exactly how do I get it?
You probably "really" want to do "hg co tip", but you should now be
able to see r21-5-34 == r21-5-latest-beta in the repo if you do hg
pull and hg log. To actually get the released code, do hg checkout
r21-5-34.
Ahem, what am I doing wrong?
After an "hg pull" (telling me I'm up to date) I get
puma:xemacs-21.5-hg $ hg tags |head
tip 5755:92028d89cc66
r21-5-33 5712:bee2e2568828
r21-5-latest-beta 5673:900a0a8796c3
r21-5-32 5673:900a0a8796c3
r21-5-31 5482:384423af8fb5
first-gplv3 5482:384423af8fb5
last-gplv2 5409:1c87bdc11d65
r21-5-30 5408:e79916901603
last-version-with-netinstall 5296:d185fa593d5f
I.e., I don't see how I can checkout r21-5-34.
FWIW; my upstream is bitbucket.org; so maybe I see an inconsistent
state. Since Raymond's email is more than a day old, I though I'd
mention it... :-/
Joachim
--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Joachim Schrod, Roedermark, Germany
Email: jschrod(a)acm.org
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3:11 a.m.
New subject: XEmacs 21.5.34 "kale" is released.
Joachim Schrod writes:
Ahem, what am I doing wrong?
Nothing.
Aidan's last push corrupted the DAG, creating a new head, and
effectively overwrote .hgtags without the release tag.
Since `hg push' is documented as refusing to create new heads unless
`--force' is used, I gather that Mercurial on Bitbucket (at least) has
a regression.
For now, you can get the release with "hg checkout -r 548fdf364cbe"
(which should "magically" get you the release tags back[1]).
Footnotes:
[1] Have I mentioned recently that hg is way suboptimal as a VCS? ;-)
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9:51 a.m.
New subject: XEmacs 21.5.34 "kale" is released.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Aidan's last push corrupted the DAG, creating a new head, and
effectively overwrote .hgtags without the release tag.
I don't think so. In particular, I don't see any of Aidan's commits
making a change to .hgtags, and I don't see any commit of yours that
creates the beta release.
For now, you can get the release with "hg checkout -r
548fdf364cbe"
(which should "magically" get you the release tags back[1]).
That does not appear to have been pushed.
In particular, I don't see anybody making a second head recently. I
suspect the second head is on your machine only. If it's too difficult
to figure out, just do "hg push --force", and I can fix it from there.
Footnotes:
[1] Have I mentioned recently that hg is way suboptimal as a VCS? ;-)
You mean git doesn't let you make pilot errors? (I know from personal
experience it *does* let me blame the VCS for them, just as Mercurial
does.)
--
Regards,
Mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
7:51 p.m.
New subject: XEmacs 21.5.34 "kale" is released.
Michael Sperber writes:
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
> Aidan's last push corrupted the DAG, creating a new head, and
> effectively overwrote .hgtags without the release tag.
I don't think so. In particular, I don't see any of Aidan's commits
making a change to .hgtags,
You wouldn't. When you're on that branch, the version of .hgtags is
unchanged from the node between my release branch and Aidan's through
Aidan's commits. In particular, it doesn't contain the release tags.
But now I can't make the tags disappear in hgk the way they did the
other day. I'm guessing this was some kind of side effect of
resolving conflicts in .hgtags. How I got conflicts in .hgtags, I
don't know.
> For now, you can get the release with "hg checkout -r
548fdf364cbe"
That does not appear to have been pushed.
*sigh* No, it wasn't. The relevant stuff has been pushed now, and a
fresh checkout shows the tags where they should be. (By the way, that
revid is now irrelevant: the public DAG is different from the one I
was looking at when I posted that.)
I'm not sure why I thought anything was pushed to bitbucket; maybe the
"pushing to ..." line scrolled out of sight. But after many years
always checking out from the public repo for release work, I changed
my production configuration to use a local repo as source (for
checkouts for adding release heralds to the ChangeLogs and
makepatch'ing) when we switched to Mercurial. So evidently the push
was local.
You mean git doesn't let you make pilot errors?
Sure it does. It's just that they've always been easy to fix (YMMV
;-), and using everyday git operations to play with the DAG is
nondestructive, so experimenting is risk-free. And I never get
confused about where I'm pushing to. Even when I have multiple
workspaces, I do everything out of one GITDIR. So the remote relative
to git's configuration is always the public repo, never something
local.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
8:03 p.m.
New subject: XEmacs 21.5.34 "kale" is released.
Stephen J. Turnbull writes:
*sigh* No, it wasn't. The relevant stuff has been pushed now, and a
fresh checkout shows the tags where they should be.
Great. I got 21.5.34 now, and will be able to build it later this
night.
Thanks a lot for cleaning up the issue.
Joachim
--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Joachim Schrod, Roedermark, Germany
Email: jschrod(a)acm.org
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
10:02 a.m.
New subject: XEmacs 21.5.34 "kale" is released.
On 08/26/13 04:11, Stephen J. Turnbull wrote:
Aidan's last push corrupted the DAG, creating a new head, and
effectively overwrote .hgtags without the release tag.
Since `hg push' is documented as refusing to create new heads unless
`--force' is used, I gather that Mercurial on Bitbucket (at least) has
a regression.
For now, you can get the release with "hg checkout -r 548fdf364cbe"
(which should "magically" get you the release tags back[1]).
Doesn't work at the moment.
puma:xemacs-21.5-hg $ hg pull -u
pulling from https://bitbucket.org/xemacs/xemacs
searching for changes
no changes found
puma:xemacs-21.5-hg $ hg checkout -r 548fdf364cbe
abort: unknown revision '548fdf364cbe'!
I think I'll wait for your repair of the bitbucket repository. I
write this just as a heads-up that you'll tell us when that repair
will have happened.
Best,
Joachim
--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Joachim Schrod, Roedermark, Germany
Email: jschrod(a)acm.org
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
7:58 p.m.
New subject: XEmacs 21.5.34 "kale" is released.
>>>> "Joachim" == Joachim Schrod
<jschrod(a)acm.org> writes:
Joachim> After an "hg pull" (telling me I'm up to date) I get
Joachim> puma:xemacs-21.5-hg $ hg tags |head
Joachim> tip 5755:92028d89cc66
Joachim> r21-5-33 5712:bee2e2568828
Joachim> r21-5-latest-beta 5673:900a0a8796c3
Joachim> r21-5-32 5673:900a0a8796c3
Joachim> r21-5-31 5482:384423af8fb5
Joachim> first-gplv3 5482:384423af8fb5
Joachim> last-gplv2 5409:1c87bdc11d65
Joachim> r21-5-30 5408:e79916901603
Joachim> last-version-with-netinstall 5296:d185fa593d5f
Joachim> I.e., I don't see how I can checkout r21-5-34.
Joachim> FWIW; my upstream is bitbucket.org; so maybe I see an inconsistent
Joachim> state. Since Raymond's email is more than a day old, I though I'd
Joachim> mention it... :-/
For the record, I just did an hg pull -u and I can r21-5-34 now. And
when I build it, the new version does say beta34 kale.
Ray
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
10:41 p.m.
New subject: XEmacs 21.5.34 "kale" is released.
>>>> Raymond Toy <toy.raymond(a)gmail.com> writes:
For the record, I just did an hg pull -u and I can r21-5-34 now.
And when I build it, the new version does say beta34 kale.
+1 - So did buildbot master and the slaves to!
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4106
days inactive
4107
days old
8 comments
6 participants
participants (6)
-
Joachim Schrod -
Michael Sperber -
Raymond Toy -
Stephen J. Turnbull -
Stephen J. Turnbull -
The XEmacs Package Smoketest