Re: [Octave Forge] Octave 4.0 call for packages

[Carnë Draug]

On 14 April 2015 at 12:30, c. <address@hidden> wrote:
>
> On 14 Apr 2015, at 13:13, Carnë Draug <address@hidden> wrote:
>
>> No.  They stay applied on both places.  If you pull changes from A and
>> then push those into B, the changes are the same. Only if then you push
>> more changes of your own on top of B, but then A just needs to pull them
>> to become updated. That's just the nature of a distributed VCS.
>
> No if I pull from bitbucket, merge my changes and push to OF my changes will
> not be on bitbucket.
>

They will not. And what's the problem with that? If there's more changes in
the bitbucket clone after this merge, and someone tries to merge them again
later, mercurial will know what has already been merged.

>
> Of course someone can pull from OF and push to bitbucket afterwards,
> but until that happens the two repos are indeed different.
>
> [...]
>
> Indeed many complicated things can be done with distributed VCS, but just
> because you can doesn't mean you should.
>

Between your commit on your local clone and your push to the bitbucket repo,
they will also be different and that doesn't cause any problem.

SoC students do not have push access to the core repo either.  There's a
public facing clone of it with their own changes.  That doesn't cause any
issue either.

This is the very nature of a distributed VCS and something we should be
making use of.  Of course it's nicer to make frequent merges rather than
a huge one after 2 years.

Anyway, I'll give Jacopo push access once I get his username and then
they can close the clone on bitbucket.

Carnë