I've made a bit of a mess in the xemacs-gtk repository by working on two
separate machines and merging.
I tried named branches but didn't do it right, and did a poor job of
merging ChangeLogs.
I have a tendency to work on more than one thing at once. It's a lot
easier to use separate check out directories
or named shelves to switch between changeset.
I think I've repaired it with "hg rebase", and I closed my named branches
using method 1 in
http://mercurial.selenic.com/wiki/PruningDeadBranches.
There are 4 named branches in the current repository. Only one of them has
two parents, which I think
means it was merged back into the default. Should we close them for at least
aesthetic reasons?
--
Jeff Sparkes
jsparkes(a)gmail.com
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/mailman/listinfo/xemacs-beta