Ros-dev

ros-dev@reactos.org

2 participants
5791 discussions

Re: [ros-dev] Microsoft switched to Git
by Alex Ionescu 16 Feb '17

16 Feb '17

Sure, I didn't count git add because you can do it with git commit -a. git status/log are the same as the svn equivalents. just like git diff/svn diff. I was mainly referring to regular workflow. In fact, I think outside of stash (which is an optional, but awesome, feature) fetch and rebase (which I refuse to learn), all commands map 1:1 with svn. That's why I don't get this whole "it takes way more commands/steps in git". git commit -a -m "[BOOTLIB] Fix yet another bug]" git push Done. Best regards, Alex Ionescu On Wed, Feb 15, 2017 at 3:48 PM, David Quintana (gigaherz) <gigaherz(a)gmail.com> wrote: > My command set is a bit more extended: > > git clone -- similar to svn checkout into a new folder > git checkout -- for changing the current branch > git pull -- effectively the same as "svn update", xcept it gets the entire > change history, not just the latest commit data > git push [--force] -- for sending changes into the repository > git fetch -- downloads stuff but doesn't apply it to the checkout copy > git merge -- can be used to merge the remote data (in which case it's like > svn update), or to merge from another branch > git branch > git add > git commit > git stash save/pop -- can be used to temporarily undo some changes, and be > able to recover them afterward > git status, git log, ... -- for getting info about the state of the > repository and the uncommited changes > ... and more I that I use less often > > I do agree that it is a bit annoying that git has so much trouble pulling > with local changes, and that is the one area where svn just simply works > better. In every other aspect, I have come to like the "git way" more. > > That said, I avoid commandline git as much as possible. I prefer to use > TortoiseGit (in Windows, at home), or SourceTree (at work, where I use a > mac, and SourceTree is probably the least shitty frontend for git). > > I like to say, that for someone who knows Subversion, learning git starts by > realizing that all the usual svn concepts, apply to git, just NOT with the > remote repository. The svn-like commands work with the local repository > clone, and then it has a separate command set for interacting with remotes. > Of course it's not a 1:1 match, but it's a good starting point. If you are > able to "catch" that, then learning how to work with git becomes a LOT > easier. > > > > On 16 February 2017 at 00:31, Alex Ionescu <ionucu(a)videotron.ca> wrote: >> >> On Wed, Feb 15, 2017 at 9:01 AM, Zachary Gorden >> <drakekaizer666(a)gmail.com> wrote: >> > Why is there a need for anything beyond "git commit" or "git push" or >> > "git >> > pull" to do anything? >> >> Good question. I've never used any other git command other than those >> (except git checkout). Oh, that's lie, I've also used "git branch", >> just like on svn, to create a branch. >> >> Sounds like you've never actually used git? I've never rebased in my >> life, and I don't know what other commands even exist. >> >> Best regards, >> Alex Ionescu >> >> _______________________________________________ >> Ros-dev mailing list >> Ros-dev(a)reactos.org >> http://www.reactos.org/mailman/listinfo/ros-dev > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

6 6

Re: [ros-dev] Microsoft switched to Git
by Alex Ionescu 15 Feb '17

15 Feb '17

On Wed, Feb 15, 2017 at 9:01 AM, Zachary Gorden <drakekaizer666(a)gmail.com> wrote: > Why is there a need for anything beyond "git commit" or "git push" or "git > pull" to do anything? Good question. I've never used any other git command other than those (except git checkout). Oh, that's lie, I've also used "git branch", just like on svn, to create a branch. Sounds like you've never actually used git? I've never rebased in my life, and I don't know what other commands even exist. Best regards, Alex Ionescu

2 1

Microsoft switched to Git
by Colin Finck 15 Feb '17

15 Feb '17

https://blogs.msdn.microsoft.com/bharry/2017/02/03/scaling-git-and-some-bac… I didn't expect Microsoft to switch to Git sooner than us..

6 16

Re: [ros-dev] Microsoft switched to Git
by Brandin L Claar 15 Feb '17

15 Feb '17

Just move everything to GitHub: https://github.com/blog/966-improved-subversion-client-support -brandin > On Feb 15, 2017, at 06:32, ros-dev-request(a)reactos.org wrote: > > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. Re: Microsoft switched to Git (Ged Murphy) > 2. Re: Microsoft switched to Git (David Quintana (gigaherz)) > 3. Re: Microsoft switched to Git (Colin Finck) > 4. Re: Microsoft switched to Git (David Quintana (gigaherz)) > 5. Re: Microsoft switched to Git (Colin Finck) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Wed, 15 Feb 2017 11:04:52 -0000 > From: "Ged Murphy" <gedmurphy.maillists(a)gmail.com> > To: "'ReactOS Development List'" <ros-dev(a)reactos.org> > Subject: Re: [ros-dev] Microsoft switched to Git > Message-ID: <004701d2877b$55983010$00c89030$(a)gmail.com> > Content-Type: text/plain; charset="utf-8" > > I think the easiest path is to switch to a centralized style model using git. > That is, we have a master copy (aka trunk) that gives the feel of our existing model. That would allow devs that prefer SVN to mostly continue working as before, and give the devs who want to use git in a more traditional way the ability to branch off and work in a git style manner, then sync their changes back into 'trunk'. > > > -----Original Message----- > From: Ros-dev [mailto:ros-dev-bounces@reactos.org] On Behalf Of Colin Finck > Sent: 15 February 2017 10:53 > To: ros-dev(a)reactos.org > Subject: Re: [ros-dev] Microsoft switched to Git > >> Am 15.02.2017 um 11:35 schrieb David Quintana (gigaherz): >> The number doesn't matter. The ReactOS project can't afford to lost >> any long-time members. Git would be a benefit for all of us, but it >> has to be a benefit for ALL of us. > > Let's not forget: > > - Part of the reasons developers had against Git may have been resolved by now. > - Part of the problem may be that "Git is so different" to some devs, but I think this can be resolved by a detailed Wiki article showing how to do the same thing in SVN and Git. We already wrote such articles for TortoiseSVN after all! > - And finally, we first need a plan for a Git move that doesn't suck. We tried SubGit and it failed for us. Then there is the "Merge workflow", which is supported very well by all tools, but creates a lot of parallel history. The "Rebase workflow" is more like what SVN does (keeping a linear history), but no idea how to enforce that with TortoiseGit. > > I think if a team could look after these things and help moving each and every developer towards Git, it may even be doable for us. > > Cheers, > > Colin > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > > > > ------------------------------ > > Message: 2 > Date: Wed, 15 Feb 2017 12:18:40 +0100 > From: "David Quintana (gigaherz)" <gigaherz(a)gmail.com> > To: ReactOS Development List <ros-dev(a)reactos.org> > Subject: Re: [ros-dev] Microsoft switched to Git > Message-ID: > <CADD3+ruo18pQos1QO+jCHg5V2-hyrrjSZ7Va1pfgm+tprDbDZw(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > My belief is that the best path would be: > > Phase 0: This is how we are now. We have SVN master (trunk), and a > read-only git mirror, and a semi-updated github mirror for when a > contributor really wants to submit git PRs. > > Phase 1: Switch to using Git with PRs for submitting patches (Github's PR > system is really really nice these days, but other solutions exist). Setup > a SVN mirror "bot" that creates one svn commit for each push/merge detected > in the master branch, and allows the buildbots to continue working as they > do now. > > This would allow the existing svn-patch workflow to continue working, but > commits on svn wouldn't be allowed anymore. Developers are expected to at > least TRY to learn to use git (it's not that hard! I promise!). > > Phase 2: We switch the buildbots and testbots to pull from git, enable > testbot access for git PRs (such as with a github bot that responds to > "@rosbot runtest" or similar). The SVN mirror remains, for archival > purposes, but git commits aren't merged so regularly. Release tags/branches > can still be published through SVN, for ease of access. > > Phase 3: Everyone ends up agreeing that maintaining the svn mirror is no > longer worth the effort. > > Of course, anything like this will only happen if the entire team agrees to > it. > > On 15 February 2017 at 12:04, Ged Murphy <gedmurphy.maillists(a)gmail.com> > wrote: > >> I think the easiest path is to switch to a centralized style model using >> git. >> That is, we have a master copy (aka trunk) that gives the feel of our >> existing model. That would allow devs that prefer SVN to mostly continue >> working as before, and give the devs who want to use git in a more >> traditional way the ability to branch off and work in a git style manner, >> then sync their changes back into 'trunk'. >> >> >> -----Original Message----- >> From: Ros-dev [mailto:ros-dev-bounces@reactos.org] On Behalf Of Colin >> Finck >> Sent: 15 February 2017 10:53 >> To: ros-dev(a)reactos.org >> Subject: Re: [ros-dev] Microsoft switched to Git >> >>> Am 15.02.2017 um 11:35 schrieb David Quintana (gigaherz): >>> The number doesn't matter. The ReactOS project can't afford to lost >>> any long-time members. Git would be a benefit for all of us, but it >>> has to be a benefit for ALL of us. >> >> Let's not forget: >> >> - Part of the reasons developers had against Git may have been resolved by >> now. >> - Part of the problem may be that "Git is so different" to some devs, but >> I think this can be resolved by a detailed Wiki article showing how to do >> the same thing in SVN and Git. We already wrote such articles for >> TortoiseSVN after all! >> - And finally, we first need a plan for a Git move that doesn't suck. We >> tried SubGit and it failed for us. Then there is the "Merge workflow", >> which is supported very well by all tools, but creates a lot of parallel >> history. The "Rebase workflow" is more like what SVN does (keeping a linear >> history), but no idea how to enforce that with TortoiseGit. >> >> I think if a team could look after these things and help moving each and >> every developer towards Git, it may even be doable for us. >> >> Cheers, >> >> Colin >> >> _______________________________________________ >> Ros-dev mailing list >> Ros-dev(a)reactos.org >> http://www.reactos.org/mailman/listinfo/ros-dev >> >> >> _______________________________________________ >> Ros-dev mailing list >> Ros-dev(a)reactos.org >> http://www.reactos.org/mailman/listinfo/ros-dev >> >

6 7

Re: [ros-dev] Microsoft switched to Git
by Alex Ionescu 15 Feb '17

15 Feb '17

How about I leave if we DON'T switch to Git? I fucking hate SVN now (read my e-mail from 8 years ago on this topic, lol!). Best regards, Alex Ionescu On Wed, Feb 15, 2017 at 3:32 AM, Colin Finck <colin(a)reactos.org> wrote: > Am 15.02.2017 um 12:18 schrieb David Quintana (gigaherz): >> Setup a SVN mirror "bot" that creates one svn commit for each push/merge >> detected in the master branch, and allows the buildbots to continue >> working as they do now. > > Let's not have a Git repository with a parallel SVN mirror again. SubGit > tried to accomplish this as a professional solution and it failed for us. > > There is no reason to take extra care of the Buildslaves at all. > The same infra people, who would do the switch to Git, could also change > the Buildslaves to use Git instead of SVN in the course of that. > > > - Colin > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

1 0

(no subject)
by katahiromz . 15 Feb '17

15 Feb '17

Microsoft will use GVFS (Git Virtual File System) to manage their huge Git repository.

1 0

FishEye DB being rebuilt
by Colin Finck 14 Feb '17

14 Feb '17

Hi all! As this is taking longer than expected, I should give a notice: In an attempt to restart hanging FishEye yet another time yesterday, its stored database of the reactos SVN repository was corrupted... I'm rebuilding it since yesterday evening, but parsing all the diffs is a long process. Can't give any ETA yet. So far, only commit information without diff is available at code.reactos.org. Cheers, Colin

4 7

Re: [ros-dev] [ros-diffs] [ekohl] 73795: [NTOSKRNL] Implement IopGetDeviceRelations().
by Thomas Faber 14 Feb '17

14 Feb '17

On 2017-02-13 23:38, ekohl(a)svn.reactos.org wrote: > + _SEH2_TRY > + { > + Relations = RelationsData->Relations; > + BufferSize = RelationsData->BufferSize; > + Buffer = RelationsData->Buffer; > + > + ProbeForWrite(RelationsData->Buffer, > + RelationsData->BufferSize, > + sizeof(CHAR)); > + } You need to use the local 'Buffer' and 'BufferSize' variables in the probe or you get a race condition. > + Status = IopInitiatePnpIrp(DeviceObject, > + &IoStatusBlock, > + IRP_MN_QUERY_DEVICE_RELATIONS, > + &Stack); > + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) > + { > + DPRINT1("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); > + goto done; > + } Failing on STATUS_PENDING seems broken. IoStatusBlock will go out of scope and the DeviceRelations set by the driver will be leaked. > + if (RequiredSize > 0) > + RequiredSize += sizeof(WCHAR); Not sure I understand the >0 condition. Best, Thomas

1 0

UEFI Bootmgr vs. FreeLdr
by Colin Finck 06 Feb '17

06 Feb '17

Hi all! Seeing the recent UEFI Bootmgr work in trunk, I was wondering about its design. Will that be a UEFI-only boot loader or eventually replace/merge with FreeLdr to provide a common boot loader for BIOS and UEFI systems? Will it simply follow all design principles of the NT6+ boot loader or also implement some own ideas or take over those from FreeLdr? For instance, I totally like FreeLdr's configuration through INI files and would prefer that any day over NT6+ BCD registry hives. Cheers, Colin

3 2

Google Summer of Code 2017
by Colin Finck 03 Feb '17

03 Feb '17

Hi all! Google Summer of Code 2017 is fast approaching, with February 9 being the deadline for projects to apply. With our record of successfully completing all 4 ideas (msahci, NTFS, lwIP, USB) last year, we should definitely apply again. Aleksey and Amine have already begun filling out the application form. Based on the 2016 ideas Wiki page, we have also created a new ideas page at https://reactos.org/wiki/Google_Summer_of_Code_2017_Ideas Please share your thoughts on these and add anything that's missing. What we now need are possible mentors. Who would be available for this? Cheers, Colin

4 4

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev