Mercurial - How did my commit get split off (see pic)?

The split is a new branch. You can merge it back to the trunk if you like, though beware of borked code. To do the merge, select the tip of the new branch, bring up the context menu, and select Merge With.It will merge with whatever Rev is currently tagged as tip.

Michal has your "how to fix" -- pick his answer --, but here's why it happened: Before committing you had not updated to the tip revision. If you do a hg pull your current-revision (as reported by hg parents) isn't updated to tip. You need to hg update tip or pull -u to make that happen.

New commits always have a parent revision of your current hg parents output, not necessarily tip.

Thanks, that makes sense. So I should always do a pull before doing a commit. – Greg Jul 8 '10 at 16:38 Yeah, do a pull and an update and if necessary a merge.

The usual work cycle is: while (true) { code; commit; pull; update; merge; if (buildable && tests_pass) { push } }. I repeat that pattern multiple times day during busy periods. – Ry4an Jul 8 '10 at 20:18.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.

Related Questions