Mark J. Nelson wrote: > Alexander Kolbasov wrote: >> Hello, >> >> I was working in a repository, changing a single (existing) file. >> Periodically I would pull from the clone, hg merge; hg commit; hg >> recommit. At some point I also reparented to the clone. >> >> As a result when I do hg outgoing it shows tons of files instead of a >> single file. What have I done wrong and how can I fix this? >> >> Let me know if you want to look at my repository. >> >> - akolb > > If you reparented to the clone and then did a recommit, then the files > in your tip changeset should reflect actual changes in your repository > relative to the clone. > > You mentioned reparenting TO the clone, but not what you were > reparenting FROM. Is it possible that you had change from a different > repository, which now shows up? If that's the case, then you can "fix" > it by reparenting back to that repository and recommitting, in which > case you'll have a single, tip changeset with your one, small change. > But the rest will still reappear relative to the clone, if they're in > your repository.
I should add that this is based on an assumption that the other parent is also synced with the clone. If that's not true, then you're really in an awkward situation, with changes from two divergent parents, which can only be reconciled with a single parent. > The more usual complaint is that you see a ton of files after a merge, > but before a recommit, because your merge changeset includes all of the > changes from both parent branches (yours and the one you just pulled > from the clone). > > ? > > I'm happy to take a look if you send a pointer. > > --Mark > _______________________________________________ > tools-discuss mailing list > tools-discuss@opensolaris.org _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org
