On Tue, Feb 19, 2008 at 5:31 AM, Kai Antweiler <[EMAIL PROTECTED]> wrote:
> Dirty fix would be adding/removing an empty line in the file "README". > > Please give me two revisions (the hash values, not the revision numbers) > and the mercurial commands that you use, so that I can investigate the > problem myself. > -- > Kai Antweiler Bassically, you have glob2, and you `hg clone -r beta2-rc glob2 glob2-beta2-rc` and `hg clone -r default glob2 glob2-default` so that you have your working directory for the beta2-rc branch and the default branch. Both are fully up to date, using hg update tip and such. Make a change to glob2-beta2-rc, use `hg commit`, and subsequently, `hg push` to push into glob2. Now go into glob2-default. `hg pull -r beta2-rc` to get that changeset that you just pushed so that you can merge it into the default branch. Now try to commit, it won't let it happen. I think its because the branch glob2-beta2-rc is the logical parent to, and only parent to, a past changeset in default. Thus, when you do hg pull in default, you haven't pulled across branches, and you still have only one head. A quick fix, like you suggested, is to make an arbitrary change in glob2-default before the first time you merge in from glob2-beta2-rc, which establishes the two as separate branches, so that and every subsequent pull requires a branch merge. This is what I'll do now. -- Extra cheese comes at a cost. Bradley Arsenault.
_______________________________________________ glob2-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
