From: "Philip Oakley" <philipoakley@iee.org>
To: "Junio C Hamano" <gitster@pobox.com>,
"Ramkumar Ramachandra" <artagnon@gmail.com>
Cc: "Git List" <git@vger.kernel.org>
Subject: Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows
Date: Thu, 20 Jun 2013 21:49:57 +0100 [thread overview]
Message-ID: <E1FE663A82E6499AA9B598B4F60A5CE6@PhilipOakley> (raw)
In-Reply-To: 7vd2rgtwl3.fsf@alter.siamese.dyndns.org
From: "Junio C Hamano" <gitster@pobox.com>
Sent: Thursday, June 20, 2013 8:23 PM
> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>
>> Junio C Hamano wrote:
>>>> Decouple `simple` from `upstream` completely, and change it to mean
>>>> `current` with a safety feature: a `push` and `pull` should not be
>>>> asymmetrical in the special case of central workflows.
>>>
>>> Double negation confused my parser. 'push' and 'pull' should be
>>> kept symmetrical in central workflows?
>>
>> They're not the same thing. It is very much intentional and
>> intended:
>> the safety net is not to "ensure that the push and pull are
>> symmetrical" (i.e. among other things, error out if
>> branch.$branch.merge is unset), but rather "ensure that the push and
>> pull are never asymmetrical".
>
> Hmmmm....
>
> not to "ensure that the push and pull are symmetrical"
> rather "ensure that the push and pull are never asymmetrical".
>
> They still talk the same thing to me. What am I missing?
>
> Am I being clueless, or is there something else going on?
I think it is a case of the user having explicitly set push=Africa and
pull=Europe which can't be a setting for simple symmetry.
But then again I haven't been following the fine details. (that is there
are some defaults that allow stuff to be half set)
>
> Your "among other things", after reading it three times,
> unfortunately did not help clarify anything to me, so perhaps
> somebody other than me (or you for that matter) who is more clueful
> can help find a different way to explain the difference you are
> trying to express to me.
>
> Help, anybody?
>
Philip
[...]
next prev parent reply other threads:[~2013-06-20 20:49 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 11:11 [PATCH 0/6] push.default in the triangular world Ramkumar Ramachandra
2013-06-19 11:11 ` [PATCH 1/6] t/t5528-push-default: remove redundant test_config lines Ramkumar Ramachandra
2013-06-19 19:26 ` Junio C Hamano
2013-06-19 11:11 ` [PATCH 2/6] config doc: rewrite push.default section Ramkumar Ramachandra
2013-06-19 19:55 ` Junio C Hamano
2013-06-20 3:27 ` Junio C Hamano
2013-06-20 7:35 ` Johan Herland
2013-06-19 11:11 ` [PATCH 3/6] push: change `simple` to accommodate triangular workflows Ramkumar Ramachandra
2013-06-19 20:00 ` Junio C Hamano
2013-06-20 2:57 ` Junio C Hamano
2013-06-20 10:09 ` Ramkumar Ramachandra
2013-06-20 19:23 ` Junio C Hamano
2013-06-20 20:49 ` Philip Oakley [this message]
2013-06-20 21:03 ` Junio C Hamano
2013-06-20 21:22 ` Ramkumar Ramachandra
2013-06-20 21:56 ` Junio C Hamano
2013-06-20 22:05 ` Junio C Hamano
2013-06-20 21:41 ` Junio C Hamano
2013-06-19 11:11 ` [PATCH 4/6] push: remove dead code in setup_push_upstream() Ramkumar Ramachandra
2013-06-19 20:01 ` Junio C Hamano
2013-06-19 11:11 ` [PATCH 5/6] t/t5528-push-default: generalize test_push_* Ramkumar Ramachandra
2013-06-19 21:56 ` Junio C Hamano
2013-06-19 11:11 ` [PATCH 6/6] t/t5528-push-default: test pushdefault workflows Ramkumar Ramachandra
2013-06-19 22:17 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2013-06-24 4:33 [PATCH 0/6] Reroll of rr/triangular-push-fix Junio C Hamano
2013-06-24 4:33 ` [PATCH 3/6] push: change `simple` to accommodate triangular workflows Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:43 ` Junio C Hamano
2013-06-24 7:46 ` Ramkumar Ramachandra
2013-06-24 8:48 ` Johan Herland
2013-06-24 14:13 ` Ramkumar Ramachandra
2013-06-24 7:59 ` Junio C Hamano
2013-06-24 8:48 ` Johan Herland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1FE663A82E6499AA9B598B4F60A5CE6@PhilipOakley \
--to=philipoakley@iee.org \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).