dummy merge (two branches) for dummies

[Kevin Bullock]

> On Aug 19, 2016, at 03:33, Uwe Brauer <oub at mat.ucm.es> wrote:
> 
> Hi
> 
> Thanks very much!
> 
>> After that here are three example merges that keep foo changes:
> 
>> 1) hg update uwe
>>   hg merge foo --tool internal:other
>>   hg commit -m "Merge foo internal:other"
> 
>> 2) hg update foo
>>   hg debugsetparents uwe foo
>>   hg branch uwe
> nitpicking that should be hg merge uwe ? :-D
> 
>>   hg commit -m "Merge using debugsetparents"
> 
>> 3) hg update uwe
>>   hg merge foo --tool internal:other
>>   hg revert --all -r foo
>>   hg commit -m "Merge foo, discard uwe changes"
> 
>> Note: The contents of foo.txt is the same in all examples.
> 
>> In example 1, uwe changes to all files that foo knows about are
>> discarded but new files uwe adds are kept. In example 2, uwe changes
>> to files also changed by foo are discarded but all other uwe changes
>> are kept. (See contents of uwe1.txt.)
> 
> Ok that difference is very important.

...except it's not quite true. Example 1 would _also_ keep any non-overlapping changes from 'uwe' in files that also existed in 'foo'.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock