search

sillsdev / chorus

End-user collaboration library via 3-way xml merging and hg dvcs under the hood
6 stars 26 forks source link

Merge feature/nuget into master #254

Closed ermshiperete closed 3 years ago

ermshiperete commented 3 years ago

This change is Reviewable

lgtm-com[bot] commented 3 years ago

This pull request introduces 3 alerts and fixes 1 when merging a0bdff005c1a2fda9c7be20112b55f61715a97e4 into 97a15e86a196d561ed3691eb45bd42e8dbed6559 - view on LGTM.com

new alerts:

fixed alerts:

bobeaton commented 3 years ago

I use the ChorusMergeModule… are you saying that it is no longer valid?

Bob

From: Jason Naylor @.> Sent: Friday, April 30, 2021 3:45 PM To: sillsdev/chorus @.> Cc: Subscribed @.***> Subject: Re: [sillsdev/chorus] Merge feature/nuget into master (#254)

EXTERNAL EMAIL

CAUTION: This email originated from outside your organization. Exercise caution when opening attachments or clicking links, especially from unknown senders.

@jasonleenaylor commented on this pull request.

Reviewed 8 of 77 files at r1, 1 of 28 files at r2, 28 of 139 files at r4, 1 of 11 files at r5, 4 of 55 files at r7, 1 of 32 files at r8, 3 of 9 files at r9. Reviewablehttps://reviewable.io/reviews/sillsdev/chorus/254 status: 46 of 269 files reviewed, 2 unresolved discussions (waiting on @ermshiperetehttps://github.com/ermshiperete)

GitVersion.yml, line 6 at r9https://reviewable.io/reviews/sillsdev/chorus/254#-MZZV7CM1D7WheQdyHuC:-MZZV7CNAKx5045ggGWl:bzavsno (raw filehttps://github.com/sillsdev/chorus/blob/a0bdff005c1a2fda9c7be20112b55f61715a97e4/GitVersion.yml#L6):

beta

We are really releasing from master aren't we, shouldn't this be stable, or something other than beta?

MercurialExtensions/.guidsForInstaller.xml, line 2 at r9https://reviewable.io/reviews/sillsdev/chorus/254#-MZZVrFl-ynh1QOM6jM0:-MZZVrFm4RNuvRuymf0L:b-qwf9w4 (raw filehttps://github.com/sillsdev/chorus/blob/97a15e86a196d561ed3691eb45bd42e8dbed6559/MercurialExtensions/.guidsForInstaller.xml#L2):

This makes me wonder about the Chorus MergeModule that we have been building and using in the past. Any windows installers which relied on this will need to be updated if we have stopped supporting it. (I'm not sure what the status of it is in the feature/nuget branch.)

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://github.com/sillsdev/chorus/pull/254#pullrequestreview-649607260, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ABDUY5LVEX3XIDWYJJFBS7LTLMJD7ANCNFSM434JAB5Q.

This message and its contents are intended only for the person or entity to which it is addressed. It may contain confidential and/or protected material. Any review, transmission, dissemination or other use of this information by anyone other than the intended recipient is strictly prohibited. If you are not the intended recipient, please notify the sender by replying to this message and then delete it from your system. Thank you.