Rebasing published branch

[Dave S]

Hi!

On Tue, Feb 10, 2015 at 7:01 AM, Harry . <voldermort at hotmail.com> wrote:

>
> > Subject: Re: Rebasing published branch
> > From: hchapman-hg at 3gfp.com
> > Date: Tue, 10 Feb 2015 09:56:35 -0500
> >
> > Is there anything wrong with merging?
> >
> > ... some changes on ‘a’
> > hg up b
> > hg merge a
> > hg commit -m “merged changes from a into b”
> > hg up a
> > ... continue working on ‘a’
> >
> > @ changeset: 7:5af2cf138f7b b
> > |\ merged changes from a into b
> > | o changeset: 6:1ec72275a383 a
> > | | E
> > | o changeset: 5:436e8c202749
> > | | D
> > o | changeset: 4:75fa541adfa2
> > |\| merged changes from a into b
> > | o changeset: 3:f7185bd3847f
> > | | C
> > | o changeset: 2:7bbfeb3ecb42
> > | | B
> > o | changeset: 1:6709b5c785f0
> > |/ different type of build
> > o changeset: 0:e23856969bb4
> > initial work on a
>
> I guess that would work, although it creates a lot of merge noise.
>
>
What are you considering that "noise" to be ?

/dps

-- 
test signature -- please apply at front gate on Tuesdays only.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20150219/2c2c7cbb/attachment-0002.html>