"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> I think these problems mostly occur when you pull patches you've
> previously transplanted, which I don't think is likely to occur in this
> setting, i.e. temporary cherry-picked branches. (I manage Scheme 48
> releases exclusively using "hg transplant", and it works great.)
True, *if* people follow my directions to the letter and use branches.
But actually, I think it is quite likely to occur in this use case,
because "what comes naturally" looks like this:
hg clone xemacs-beta
cd xemacs-beta
./configure; make; src/xemacs &
# several days pass
hg transplant -s $URLFORXEMACS gotta-have-this-patch
./configure; make; src/xemacs &
# more days pass
hg pull -u
==> We're sorry, this pull cannot be completed as dialed.
Please check the number and merge your pull again.
Maybe it could be presented more accurately (less dramatically?).
I'd just say:
Make sure you don't try to pull into the transplant branch.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta