W dniu 24.12.2020 o 03:01, Jonathan Chen pisze:
> Hi,
>
> With the transition to git, I'm now getting a lot of prompts for
> differences against an empty $FreeBSD$, eg:
>
> *** Displaying differences between installed version and ./.cshrc:
>
> --- /.cshrc 2020-09-03 19:14:19.258107000
Wait, what exactly did you do btw? I tried just switching the url and now
i'm getting "your branch and Origin/stable/12 have diverged, and have
261519 and 243116 different commits each, respectively" is the github
stable/12 not the same as the freebsd.org one?
On Wed, 30 Dec 2020 at 08:30, Peter
On Wed, Dec 30, 2020 at 05:07:19PM +0100, Ulrich Spörlein wrote:
> ...
> >> However, wouldn't this mean that every run of "mergemaster" would
> >> prompt for local changes? The nice thing about using the $FreeBSD$
> >> tags was that if I approved a local-change, subsequent runs of
> >> mergemaster
On Fri, 2020-12-25 at 04:18:22 -0800, David Wolfskill wrote:
On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote:
Hi Kyle,
On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote:
...
> mergemaster only uses it as an optimization, if they're unexpanded
> throughout then it falls back to
I was using github instead of the git repository below.
Thx. All set now
Peter
> On 30 Dec 2020, at 10:32, Yasuhiro Kimura wrote:
>
> From: Peter Blok
> Subject: No more update on stable/12
> Date: Wed, 30 Dec 2020 10:24:27 +0100
>
>> I switched to git, but I noticed there were no MFC or
On Wed, Dec 30, 2020 at 17:44 Li-Wen Hsu wrote:
> On Wed, Dec 30, 2020 at 17:33 Yasuhiro Kimura wrote:
>
>> From: Peter Blok
>> Subject: No more update on stable/12
>> Date: Wed, 30 Dec 2020 10:24:27 +0100
>>
>> > I switched to git, but I noticed there were no MFC or any other updates
>> over
On Wed, Dec 30, 2020 at 17:33 Yasuhiro Kimura wrote:
> From: Peter Blok
> Subject: No more update on stable/12
> Date: Wed, 30 Dec 2020 10:24:27 +0100
>
> > I switched to git, but I noticed there were no MFC or any other updates
> over the last couple of days after the migration. git fetch
From: Peter Blok
Subject: No more update on stable/12
Date: Wed, 30 Dec 2020 10:24:27 +0100
> I switched to git, but I noticed there were no MFC or any other updates over
> the last couple of days after the migration. git fetch doesn’t show any
> change.
>
> Is this correct and just the
Hi,
I switched to git, but I noticed there were no MFC or any other updates over
the last couple of days after the migration. git fetch doesn’t show any change.
Is this correct and just the learning process of git or is something wrong with
my git clone?
Peter
smime.p7s
Description:
