Rebasing published branch

Harry . voldermort at hotmail.com
Fri Feb 20 11:07:09 UTC 2015


> > From: hchapman-hg at 3gfp.com<mailto: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 ? 

Every second changeset is a merge. While this is technically correct, it's noise for someone viewing the development history, particularly as, form the user's perspective, this isn't a merge of divergent lines of development.
 		 	   		  


More information about the Mercurial mailing list