The below changes were from Alexander Belopolsky. When I tried to push
my changes, my changes resulted in multiple heads in 2.7, so I had to
go back 2.7 branch, merge 2.7 and then commit and push. This resulted
in both my changes as well as merged changes being pushed. I
understand that the second
Le mercredi 06 avril 2011 à 15:07 +0800, Senthil Kumaran a écrit :
> The below changes were from Alexander Belopolsky. When I tried to push
> my changes, my changes resulted in multiple heads in 2.7, so I had to
> go back 2.7 branch, merge 2.7 and then commit and push. This resulted
> in both my ch
On Wed, Apr 6, 2011 at 16:08, Antoine Pitrou wrote:
> I think the representation of merges as a diff against one of the
> parents is indeed sub-optimal. OTOH, it's not easy to come up with
> something better.
This might be of interest: https://bitbucket.org/wolever/hg-mergediff/.
Cheers,
Dirkja
On 06/04/2011 17.08, Antoine Pitrou wrote:
Le mercredi 06 avril 2011 à 15:07 +0800, Senthil Kumaran a écrit :
The below changes were from Alexander Belopolsky. When I tried to push
my changes, my changes resulted in multiple heads in 2.7, so I had to
go back 2.7 branch, merge 2.7 and then commit
On 4/6/2011 4:45 PM, Ezio Melotti wrote:
On 06/04/2011 17.08, Antoine Pitrou wrote:
Le mercredi 06 avril 2011 à 15:07 +0800, Senthil Kumaran a écrit :
The below changes were from Alexander Belopolsky. When I tried to push
my changes, my changes resulted in multiple heads in 2.7, so I had to
g
