Re: gtk3 and master double patches should better be applied to master and then merged

[John Darrington]

In the past, we've tried to avoid merging too often.  

Many of the bugs you've reported recently are in fact bugs present in both 
branches, but for whatever reason only manifest themselves in gtk3
In this case, where it seemed to be appropriate I applied the patch to both
branches.

Like you say, this does mean that when the merge does occur, two entries for
the same commit will be seen in the merged result.

I don't mind if we want to change our policy and apply such changes to master,
then immediately merge to gtk3.

On the other hand, maybe we're not too far away from the point where we can 
completely migrate to the gtk3 branch?

J'



On Mon, May 18, 2015 at 12:09:24AM +0200, Friedrich Beckmann wrote:
     Hi, the merge worked without conflict. No manual resolution is required. 
The difference is that git has two separate commits when a patch is applied in 
each branch separately. When applied in master and then merged to gtk3 this is 
visible and known internally just as one commit. 
     
     Am 17.05.2015 um 23:52 schrieb Ben Pfaff <address@hidden>:
     
     > On Sun, May 17, 2015 at 11:46:20PM +0200, Friedrich Beckmann wrote:
     >> some of the recent patches are applied both to master and gtk3 branch. 
After a merge from master to gtk3 they are still doubled. This
     >> is different when a patch is applied only to master and then merged to 
gtk3. Below is the gitk view of the project. You see the recent double applied 
patches twice while the merged SCATTERPLOT patch is mentionend only once.
     > 
     > It's not normally a problem for a patch to apply in two branches.
     > Usually, Git successfully merges the two branches later.
     > 
     > That said, applying to one branch, then merging to the other, often
     > works just as well.
     
     
     
     
     
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

signature.asc
Description: Digital signature