what do I need to learn to do this task?

[Becker, Mischa J]

      From: Michael Mossey
      Sent: Tuesday, May 13, 2014 2:03 AM

      On 5/12/2014 11:30 PM, Dave S wrote:

      On May 12, 2014 11:05 PM, "Michael Mossey" <michaelmossey at gmail.com<mailto:michaelmossey at gmail.com>> wrote:
      > I just need a couple more specifics. So would this be right?
      I think you've got it.
      Even if merging brings in extra history, I would concentrate on the basics first.  When you're more comfortable, you can look at rebase, evolve, or even convert.
      /dps
      Hang on a second. I need to know *now* more specifically what I can do about all the meaningless changesets that I would bring into the main repo. I'm not going to charge ahead without knowing at least a little about that.

      What you have gotten me to  understand so far is that the meaningless changesets will be on a "branch" of sorts... there will be some revision that has two parents, one of them a long chain of meaningless changesets, the other one a truly meaningful revision of the main repo.

      My goal is to avoid cluttering logs with meaningless changesets. Can you give me some sense now of how that will happen or look?

      I'm already comfortable with merging.

      Mike
The simplest thing to do is to create a named branch to hold your ‘meaningless’ changes which you merge into the main development branch as needed.  You can then easily filter the repo history to exclude that branch or to only include default, or whatever name you’ve given the main development branch.  I personally tend to do this even if I’m using different repo clones just for the added clarity when looking at history.
If you never want to see those meaningless changesets again you can either look into evolve, which I have no experience with, or learn about history editing and things like rebase and strip. The problem with history editing is that changeset deletions don’t propagate so anything you strip out of your laptop repo would also need to be stripped out of the Bitbucket and desktop repos.
Mischa



  ________________________________

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140513/a0cbecaf/attachment-0002.html>