5:22 a.m.
Michael -
Why does the .hgsub file in the xemacsweb repository contain:
../xemacs
../xemacs-packages
? When I clone the xemacsweb repo, I get a copy of the packages and
the 21.5 sources. That's more than I want. Do you mean to have those
sub-repos listed there? If so, is there some way I can elide them
from my copy of the repo?
Thanks,
Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
7:37 a.m.
Vin Shelton <acs(a)alumni.princeton.edu> writes:
Michael -
Why does the .hgsub file in the xemacsweb repository contain:
../xemacs
../xemacs-packages
?
Because they're needed to generate the documentation from the Texinfo
files in there.
When I clone the xemacsweb repo, I get a copy of the packages and
the 21.5 sources. That's more than I want. Do you mean to have those
sub-repos listed there? If so, is there some way I can elide them
from my copy of the repo?
I don't thunk so.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
11:18 a.m.
Michael Sperber writes:
> When I clone the xemacsweb repo, I get a copy of the packages
and
> the 21.5 sources. If so, is there some way I can elide them from
> my copy of the repo?
I don't thunk so.
Is there any reason why the 21.5 sources have to be completely up to
date? If not, he can just delete them and commit that locally, and
then commit at top level. In the infrequent event that the 21.5
sources for xemacsweb are updated, he'll get a conflict in
.hgsubstate. But that might be worth it to him.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
11:20 a.m.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> > When I clone the xemacsweb repo, I get a copy of the packages and
> > the 21.5 sources. If so, is there some way I can elide them from
> > my copy of the repo?
>
> I don't thunk so.
Is there any reason why the 21.5 sources have to be completely up to
date?
No. But I don't know why that would be relevant.
If not, he can just delete them and commit that locally, and
then commit at top level.
What do you mean by "commit [...] locally"? Commit to what repository?
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
12:15 p.m.
Michael Sperber writes:
> Is there any reason why the 21.5 sources have to be completely
up to
> date?
No. But I don't know why that would be relevant.
Frequency of conflicts when xemacsweb's 21.5 and package sources get
updated is what I had in mind.
> If not, he can just delete them and commit that locally, and
> then commit at top level.
What do you mean by "commit [...] locally"? Commit to what repository?
Ouch. I guess he can't push from a 21.5-less xemacsweb, can he.
This kinda sucks.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
12:25 p.m.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> > Is there any reason why the 21.5 sources have to be completely up to
> > date?
>
> No. But I don't know why that would be relevant.
Frequency of conflicts when xemacsweb's 21.5 and package sources get
updated is what I had in mind.
Why would there be a conflict? For a conflict, he'd need to edit the
XEmacs sources and package sources *within* xemacsweb in a conflicting
way.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
2:36 p.m.
Michael Sperber writes:
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
> Frequency of conflicts when xemacsweb's 21.5 and package
sources get
> updated is what I had in mind.
Why would there be a conflict?
If Vin deletes the "redundant" subtrees, and somebody else updates
21.5 inside xemacsweb, then the entries for "xemacs" in .hgsubstate
will conflict. No?
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
2:54 p.m.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> "Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
> > Frequency of conflicts when xemacsweb's 21.5 and package sources get
> > updated is what I had in mind.
>
> Why would there be a conflict?
If Vin deletes the "redundant" subtrees, and somebody else updates
21.5 inside xemacsweb, then the entries for "xemacs" in .hgsubstate
will conflict. No?
If you delete the subrepository and try to commit anything, Mercurial
will abort because the revision of the subrepo listed in .hgsubstate
isn't present anymore.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4:25 p.m.
On Fri, Jan 13, 2012 at 9:54 AM, Michael Sperber wrote:
If you delete the subrepository and try to commit anything,
Mercurial
will abort because the revision of the subrepo listed in .hgsubstate
isn't present anymore.
Stephen wrote:
This kinda sucks.
What he said.
I don't really want multiple copies of xemacs-packages and 21.5. Can
I just remove the xemacs-21.5 sub-directory and create a symlink to my
main 21.5 copy?
- Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4:29 p.m.
Vin Shelton <acs(a)alumni.princeton.edu> writes:
On Fri, Jan 13, 2012 at 9:54 AM, Michael Sperber wrote:
> If you delete the subrepository and try to commit anything, Mercurial
> will abort because the revision of the subrepo listed in .hgsubstate
> isn't present anymore.
Stephen wrote:
> This kinda sucks.
What he said.
I don't really want multiple copies of xemacs-packages and 21.5. Can
I just remove the xemacs-21.5 sub-directory and create a symlink to my
main 21.5 copy?
You can probably use the share extension:
http://mercurial.selenic.com/wiki/ShareExtension
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
7:26 a.m.
Michael Sperber writes:
If you delete the subrepository and try to commit anything,
Mercurial
will abort because the revision of the subrepo listed in .hgsubstate
isn't present anymore.
Probably he would need to update his local repo's copy of .hgsub and
commit. That should do the trick, no? There would still be the
problem that he probably can't safely push from that repo, because
that would apply the same change to the master repo.
I wonder if instead we could
(1) remove the "xemacs" and "xemacs-packages" subrepos from the
master
"xemacsweb" repo;
(2) readd them as a local change on Tux and other websites that update
directly from the master repo;
(3) have the commit trigger merge from the master repo.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
8:29 a.m.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> If you delete the subrepository and try to commit anything, Mercurial
> will abort because the revision of the subrepo listed in .hgsubstate
> isn't present anymore.
Probably he would need to update his local repo's copy of .hgsub and
commit. That should do the trick, no? There would still be the
problem that he probably can't safely push from that repo, because
that would apply the same change to the master repo.
Yes.
I wonder if instead we could
(1) remove the "xemacs" and "xemacs-packages" subrepos from the
master
"xemacsweb" repo;
(2) readd them as a local change on Tux and other websites that update
directly from the master repo;
(3) have the commit trigger merge from the master repo.
We could do that, but Adrian's idea was that you build the website
locally. I'd like the repo to provide the capability. I just don't see
what the big deal is: You do get extra copies, but you can either share
the repos (see my other e-mail) or just deal with the overhead - disk
space seems pretty inflationary these days.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4696
days inactive
4697
days old
11 comments
3 participants
participants (3)
-
Michael Sperber -
Stephen J. Turnbull -
Vin Shelton