Re: [webkit-dev] Moving to Git

> On Feb 21, 2019, at 12:18 AM, Bug Tracker > wrote: > > Thank you all very much for your help! I really appreciate it. :-) > > P.S.: I decided to start learning git-svn. https://trac.webkit.org/wiki/UsingGitWithWebKit has the information you

Re: [webkit-dev] Moving to Git

Thank you all very much for your help! I really appreciate it. :-) P.S.: I decided to start learning git-svn. ‐‐‐ Original Message ‐‐‐ On Wednesday, February 20, 2019 11:48 PM, Adrian Perez de Castro wrote: > On Wed, 20 Feb 2019 22:30:22 +0300, Konstantin Tokarev annu...@yandex.ru

Re: [webkit-dev] Moving to Git

On Wed, 20 Feb 2019 22:30:22 +0300, Konstantin Tokarev wrote: > 20.02.2019, 22:27, "Bug Tracker" : > > > Sorry, for the anonymous email. I opted for it because the list archives > > are public and concluded that it's not that useful to reveal my identity > > for the purposes of this

Re: [webkit-dev] Moving to Git

> On Feb 20, 2019, at 12:14 PM, Michael Catanzaro wrote: > > FWIW, it's not hard to enforce fast-forward merges with a git hook; that way, > we can guarantee that the history has no merge commits and is fully linear. > GitLab has built-in support to enforce this for merge requests (though

Re: [webkit-dev] Moving to Git

FWIW, it's not hard to enforce fast-forward merges with a git hook; that way, we can guarantee that the history has no merge commits and is fully linear. GitLab has built-in support to enforce this for merge requests (though not for direct commits). I agree that linear history is a must for a

Re: [webkit-dev] Moving to Git

I considered this option, but my work will involve touching multiple parts of the codebase and thus I would like to be able to keep up / merge locally with the upstream every now and then (e.g. on each relatively stable release, such as Apple's Safari Technology Preview). However, all

Re: [webkit-dev] Moving to Git

20.02.2019, 22:27, "Bug Tracker" : > Sorry, for the anonymous email. I opted for it because the list archives are > public and concluded that it's not that useful to reveal my identity for the > purposes of this question. > > In short, however, I am a graduate student interested in using

Re: [webkit-dev] Moving to Git

Sorry, for the anonymous email. I opted for it because the list archives are public and concluded that it's not that useful to reveal my identity for the purposes of this question. In short, however, I am a graduate student interested in using WebKit for an academic project and thought that I

Re: [webkit-dev] Moving to Git

Are you a WebKit developer? I can't tell from your email. Simon > On Feb 20, 2019, at 8:27 AM, Bug Tracker > wrote: > > Hi, > > I was curious about the status of the proposal for migrating from SVN to Git > (https://trac.webkit.org/wiki/Moving%20to%20Git >

Re: [webkit-dev] Moving to Git

On Wed, Feb 20, 2019 at 10:02 AM Philippe Normand wrote: > On Wed, 2019-02-20 at 09:40 -0800, Ryosuke Niwa wrote: > > > > On Wed, Feb 20, 2019 at 8:28 AM Bug Tracker < > > bug.tracking.acco...@protonmail.com> wrote: > > > I was curious about the status of the proposal for migrating from > > >

Re: [webkit-dev] Moving to Git

On Wed, 2019-02-20 at 09:40 -0800, Ryosuke Niwa wrote: > > On Wed, Feb 20, 2019 at 8:28 AM Bug Tracker < > bug.tracking.acco...@protonmail.com> wrote: > > I was curious about the status of the proposal for migrating from > > SVN to Git (https://trac.webkit.org/wiki/Moving%20to%20Git). > > > >

Re: [webkit-dev] Moving to Git

On Wed, Feb 20, 2019 at 8:28 AM Bug Tracker < bug.tracking.acco...@protonmail.com> wrote: > > I was curious about the status of the proposal for migrating from SVN to > Git (https://trac.webkit.org/wiki/Moving%20to%20Git). > > The relevant page on the Trac wiki hasn't been updated for over 5

Re: [webkit-dev] Moving to Git?

On Fri, Mar 9, 2012 at 6:35 PM, Pablo Flouret pab...@motorola.com wrote: I'd prefer to see something closer to what 'git format-patch' spits out. Basically you give it a commit range and it spits out one diff per commit, including the commit message. That seems to imply we're completely

Re: [webkit-dev] Moving to Git?

From: Ryosuke Niwa rn...@webkit.org To: Pablo Flouret pab...@motorola.com Cc: webkit-dev@lists.webkit.org Sent: Sunday, March 11, 2012 12:01 PM Subject: Re: [webkit-dev] Moving to Git? On Fri, Mar 9, 2012 at 6:35 PM, Pablo Flouret pab...@motorola.com wrote

Re: [webkit-dev] Moving to Git?

On Mar 9, 2012, at 12:30 PM, Mark Rowe wrote: What you'll find is that the vast majority of SVN users are simply not participating in this email thread. You'll also find that many people that use git-svn are happy enough with the status quo since it gives those who chose to use it most of

Re: [webkit-dev] Moving to Git?

...@lists.webkit.org [webkit-dev-boun...@lists.webkit.org] on behalf of Ryosuke Niwa [rn...@webkit.org] Sent: Friday, March 09, 2012 7:01 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? First, a follow up on my old post since my message was cut off in the middle

Re: [webkit-dev] Moving to Git?

...@lists.webkit.org] on behalf of Ryosuke Niwa [rn...@webkit.org] Sent: Friday, March 09, 2012 7:01 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? First, a follow up on my old post since my message was cut off in the middle: On Thu, Mar 8, 2012 at 1:25 PM, Ryosuke

Re: [webkit-dev] Moving to Git?

2012/3/11 Maciej Stachowiak m...@apple.com: The interaction with the version-control system for each of these steps is an obvious single step with SVN. With git, for at least some of these, you will end up needing multiple non-obvious (to an SVN user anyway) commands. I understand the

Re: [webkit-dev] Moving to Git?

On Mar 10, 2012, at 9:55 PM, Kalle Vahlman wrote: 2012/3/11 Maciej Stachowiak m...@apple.com: The interaction with the version-control system for each of these steps is an obvious single step with SVN. With git, for at least some of these, you will end up needing multiple non-obvious (to

Re: [webkit-dev] Moving to Git?

On 09.03.12 01:36, Aaron Boodman wrote: I think it would look the same, except for instead of monotonically increasing decimal numbers in the revision column, you'd see random hexadecimal ones (typically 6-8 digits long). It would be possible to use 'git describe' [1] to give something like

Re: [webkit-dev] Moving to Git?

On 08.03.12 22:25, Ryosuke Niwa wrote: That'll certainly be an improvement. I still dislike git hashes though. If someone implements such a script in webkit-patch and we can automatically assign svn-revision like numbers to all commits, I can be convinced to use git. Dunno about webkit-patch,

Re: [webkit-dev] Moving to Git?

08.03.2012, 21:35, Alexis Menard alexis.men...@openbossa.org: On Thu, Mar 8, 2012 at 2:32 PM, Konrad Piascik kpias...@rim.com wrote:  It is possible to keep linear history with git.  This just requires you to fast forward and rebase before pushing. But can you enforce in the server? To

Re: [webkit-dev] Moving to Git?

: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 12:04 PM, Adam Treat atr...@rim.commailto:atr...@rim.com wrote: There is nothing about git that forces you to have multiple branches locally. Good practice, yes, but nothing forcing it. As for the difficulty of resolving conflicts between patches

Re: [webkit-dev] Moving to Git?

09.03.2012, 18:24, Adam Treat atr...@rim.com: With svn up you are just as likely to see a conflict. And in case of doubtful conflicts you won't be able to revert you tree to it's previous state so easily as with git. -- Regards, Konstantin ___

Re: [webkit-dev] Moving to Git?

From: David Barr davidb...@google.com To: Ryosuke Niwa rn...@webkit.org Cc: webkit-dev@lists.webkit.org webkit-dev@lists.webkit.org Sent: Friday, March 9, 2012 2:37 AM Subject: Re: [webkit-dev] Moving to Git? I think we ought to streamline the git workflow

Re: [webkit-dev] Moving to Git?

On Fri, Mar 9, 2012 at 7:14 AM, Ashod Nakashian ashodnakash...@yahoo.comwrote: Can you be more specific? What do you find wanting in the git workflow besides the few cases raised by svn users (such as svn up that can be supported in update-webkit)? I'm also annoyed by now git diff works

Re: [webkit-dev] Moving to Git?

-dev-boun...@lists.webkit.org [webkit-dev-boun...@lists.webkit.org] on behalf of Ryosuke Niwa [rn...@webkit.org] Sent: Friday, March 09, 2012 11:33 AM To: Ashod Nakashian Cc: webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? On Fri, Mar 9, 2012 at 7:14 AM, Ashod Nakashian

Re: [webkit-dev] Moving to Git?

2012/3/9 Ryosuke Niwa rn...@webkit.org: On Fri, Mar 9, 2012 at 7:14 AM, Ashod Nakashian ashodnakash...@yahoo.com wrote: I think if we address the main issues raised by the svn users, the current consensus (if representative) seems to point towards an overwhelming support (and demand?) for git

Re: [webkit-dev] Moving to Git?

On Fri, 2012-03-09 at 08:33 -0800, Ryosuke Niwa wrote: Frankly, I don't quite understand the benefit of this transition. Do we really need to move to git? If the only problem of keeping svn was about svn-apply being broken, I'm more than happy to fix that script. For me the biggest benefit

Re: [webkit-dev] Moving to Git?

On Thu, 2012-03-08 at 19:39 -0300, Alexis Menard wrote: To svn user : - Conflict resolving much easier and performant than svn (we have drivers for changelogs and the default one are much better than svn). - Local history/blaming/... - Proper diff coloration (though I'm sure you guys

Re: [webkit-dev] Moving to Git?

On 2012-03-09, at 10:23, Gustavo Noronha Silva g...@gnome.org wrote: On Thu, 2012-03-08 at 19:39 -0300, Alexis Menard wrote: To svn user : - Conflict resolving much easier and performant than svn (we have drivers for changelogs and the default one are much better than svn). - Local

Re: [webkit-dev] Moving to Git?

On 2012-03-09, at 09:15, Kalle Vahlman kalle.vahl...@gmail.com wrote: 2012/3/9 Ryosuke Niwa rn...@webkit.org: On Fri, Mar 9, 2012 at 7:14 AM, Ashod Nakashian ashodnakash...@yahoo.com wrote: I think if we address the main issues raised by the svn users, the current consensus (if

Re: [webkit-dev] Moving to Git?

: [webkit-dev] Moving to Git? I think we ought to streamline the git workflow before we start trying to proselytise Subversion users. :) Can you be more specific? What do you find wanting in the git workflow besides the few cases raised by svn users (such as svn up that can

Re: [webkit-dev] Moving to Git?

Here's my thoughts based on this and other comments On Mar 8, 2012, at 2:30 PM, Alexis Menard wrote: To the global infrastructure : - Local history for git. svn log access to the server every time you call that command. Will improve the load of the server. - Performance of checkouts/pull

Re: [webkit-dev] Moving to Git?

On Fri, 2012-03-09 at 13:43 -0800, Maciej Stachowiak wrote: - Simplified workflow, we don't need to mess with git-svn. - Companies who fork (we all do) can simplify their workflow a bit regarding branches. It sounds like avoiding use of git-svn is the big benefit to git users and perhaps

Re: [webkit-dev] Moving to Git?

On Mar 9, 2012, at 1:43 PM, ext Maciej Stachowiak wrote: It sounds like avoiding use of git-svn is the big benefit to git users and perhaps the reason this topic periodically comes up. Can anyone spell out in more detail the benefits of using straight git instead of git-svn? My main pain

Re: [webkit-dev] Moving to Git?

On Fri, Mar 9, 2012 at 14:46, Adam Treat atr...@rim.com wrote: Would be good to know who the remaining svn users are.  And who is using git/git-svn now.  I'd love to see the breakdown.  Data is good. I'm another svn user and while I'd prefer to keep using svn I'm not opposed to migrating to

Re: [webkit-dev] Moving to Git?

I'm starting to see a mathematical relationship between (a) Volume of contribution to the WebKit OpenSource Project (b) Volume of advocacy for removing svn support from the WebKit OpenSource Project The relationship seems to be of the inverse variety. In your case, Ashod: Source find . -name

Re: [webkit-dev] Moving to Git?

On Fri, 09 Mar 2012 14:47:17 -0800, Gustavo Noronha Silva g...@gnome.org wrote: I tend to think there is little or no benefit to switching to git while keeping all of the project workflow in place. The fact that we would want to keep a simple history with no merges in it pretty much defeat

Re: [webkit-dev] Moving to Git?

- Original Message - From: Geoffrey Garen gga...@apple.com To: Ashod Nakashian ashodnakash...@yahoo.com Cc: David Barr davidb...@google.com; Ryosuke Niwa rn...@webkit.org; WebKit Development webkit-dev@lists.webkit.org Sent: Saturday, March 10, 2012 2:58 AM Subject: Re: [webkit-dev

Re: [webkit-dev] Moving to Git?

First, a follow up on my old post since my message was cut off in the middle: On Thu, Mar 8, 2012 at 1:25 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 1:19 PM, Joe Mason jma...@rim.com wrote: This is only slightly more complicated I'd say astoundingly more complicated

Re: [webkit-dev] Moving to Git?

On Fri, Mar 9, 2012 at 4:01 PM, Ryosuke Niwa rn...@webkit.org wrote: git will touch Node.h twice by stashing and applying. This would mean that I would be rebuilding the world even if all changes I get from masters were in webkitpy or LayoutTests. Are there an easy way to work around this

Re: [webkit-dev] Moving to Git?

On Mar 9, 2012 3:16 PM, Pablo Flouret pab...@motorola.com wrote: On Fri, 09 Mar 2012 14:47:17 -0800, Gustavo Noronha Silva g...@gnome.org wrote: Tbh, I am much more interested in doing away with ChangeLogs than in feeling good about using git push instead of git svn dcommit. If we could find

Re: [webkit-dev] Moving to Git?

On Fri, 09 Mar 2012 17:55:59 -0800, Ryosuke Niwa rn...@webkit.org wrote: On Mar 9, 2012 3:16 PM, Pablo Flouret pab...@motorola.com wrote: On Fri, 09 Mar 2012 14:47:17 -0800, Gustavo Noronha Silva g...@gnome.org wrote: Tbh, I am much more interested in doing away with ChangeLogs than in

Re: [webkit-dev] Moving to Git?

2012/3/9 Mark Rowe mr...@apple.com: On 2012-03-09, at 09:15, Kalle Vahlman kalle.vahl...@gmail.com wrote: 2012/3/9 Ryosuke Niwa rn...@webkit.org: Frankly, I don't quite understand the benefit of this transition. Do we really need to move to git? If the only problem of keeping svn was about

Re: [webkit-dev] Moving to Git?

En 08/03/12 13:35, Ashod Nakashian escribiu: WebKittens, In the light of discovering that some SVN scripts have fallen behind in terms of maintenance[1] and WebKit's strong Git support and infrastructure, against my better judgement, I'd like to distract you from being productive by

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 7:46 AM, Sergio Villar Senin svil...@igalia.comwrote: En 08/03/12 13:35, Ashod Nakashian escribiu: WebKittens, In the light of discovering that some SVN scripts have fallen behind in terms of maintenance[1] and WebKit's strong Git support and infrastructure,

Re: [webkit-dev] Moving to Git?

To: Sergio Villar Senin Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? From: Sergio Villar Senin svil...@igalia.com To: webkit-dev@lists.webkit.org Sent: Thursday, March 8, 2012 4:46 PM Subject: Re: [webkit-dev] Moving to Git? En 08/03/12 13:35, Ashod

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian ashodnakash...@yahoo.comwrote: In the light of discovering that some SVN scripts have fallen behind in terms of maintenance[1] and WebKit's strong Git support and infrastructure, against my better judgement, I'd like to distract you from being

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian ashodnakash...@yahoo.com wrote: In the light of discovering that some SVN scripts have fallen behind in terms of maintenance[1] and WebKit's strong Git support and

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 9:10 AM, Alexis Menard alexis.men...@openbossa.orgwrote: I don't use svn but the only benefit I see of WebKit using svn is the linear history, clean, easy to read and to explore. Git repos tend to have merging commits a lot and it leads to make bisecting/history

Re: [webkit-dev] Moving to Git?

El jue, 08-03-2012 a las 14:10 -0300, Alexis Menard escribió: On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian ashodnakash...@yahoo.com wrote: In the light of discovering that some SVN scripts have fallen behind in

Re: [webkit-dev] Moving to Git?

On Thu, 2012-03-08 at 14:10 -0300, Alexis Menard wrote: On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian ashodnakash...@yahoo.com wrote: In the light of discovering that some SVN scripts have fallen behind in terms of

Re: [webkit-dev] Moving to Git?

:27 PM To: webkit-dev@lists.webkit.org webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? El jue, 08-03-2012 a las 14:10 -0300, Alexis Menard escribió: On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian

Re: [webkit-dev] Moving to Git?

on the Rogers Wireless Network - Original Message - From: Carlos Garcia Campos [mailto:carlo...@webkit.org] Sent: Thursday, March 08, 2012 12:27 PM To: webkit-dev@lists.webkit.org webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? El jue, 08-03-2012 a las 14:10

Re: [webkit-dev] Moving to Git?

-dev@lists.webkit.org webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? El jue, 08-03-2012 a las 14:10 -0300, Alexis Menard escribió: On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian ashodnakash

Re: [webkit-dev] Moving to Git?

-dev@lists.webkit.org webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? El jue, 08-03-2012 a las 14:10 -0300, Alexis Menard escribió: On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod Nakashian ashodnakash

Re: [webkit-dev] Moving to Git?

, 2012 12:27 PM To: webkit-dev@lists.webkit.org webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? El jue, 08-03-2012 a las 14:10 -0300, Alexis Menard escribió: On Thu, Mar 8, 2012 at 2:03 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 4:35 AM, Ashod

Re: [webkit-dev] Moving to Git?

On 08.03.12 18:22, Geoffrey Garen wrote: Rather than asking for a switch to git by fiat, why not improve git and our git-related infrastructure to the point where people choose to switch naturally? The fact that many valuable contributors choose not to use git is sufficient proof that switching

Re: [webkit-dev] Moving to Git?

From: Ryosuke Niwa rn...@webkit.org To: Alexis Menard alexis.men...@openbossa.org Cc: Ashod Nakashian ashodnakash...@yahoo.com; WebKit Development webkit-dev@lists.webkit.org Sent: Thursday, March 8, 2012 9:19 PM Subject: Re: [webkit-dev] Moving to Git

Re: [webkit-dev] Moving to Git?

From: Geoffrey Garen gga...@apple.com To: Ashod Nakashian ashodnakash...@yahoo.com Cc: WebKit Development webkit-dev@lists.webkit.org Sent: Thursday, March 8, 2012 9:22 PM Subject: Re: [webkit-dev] Moving to Git? Rather than asking for a switch to git by fiat

Re: [webkit-dev] Moving to Git?

[alexis.men...@openbossa.org] Sent: Thursday, March 08, 2012 18:35 To: Konrad Piascik Cc: webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 2:32 PM, Konrad Piascik kpias...@rim.com wrote: It is possible to keep linear history with git. This just requires you

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian ashodnakash...@yahoo.comwrote: And that's a show stopper for me. For build bot maintenance, regression fixes, etc... being able to easily tell the number of commits between two revisions (in my head as opposed to using a tool) or the ordering

Re: [webkit-dev] Moving to Git?

: Thursday, March 08, 2012 3:00 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian ashodnakash...@yahoo.commailto:ashodnakash...@yahoo.com wrote: And that's a show stopper for me. For build bot maintenance, regression

Re: [webkit-dev] Moving to Git?

, March 08, 2012 3:00 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian ashodnakash...@yahoo.commailto:ashodnakash...@yahoo.com wrote: And that's a show stopper for me. For build bot maintenance, regression fixes

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 12:04 PM, Adam Treat atr...@rim.com wrote: There is nothing about git that forces you to have multiple branches locally. Good practice, yes, but nothing forcing it. As for the difficulty of resolving conflicts between patches you've made locally and changes made on

Re: [webkit-dev] Moving to Git?

...@lists.webkit.org] on behalf of Ryosuke Niwa [ rn...@webkit.org] Sent: Thursday, March 08, 2012 3:00 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian ashodnakash...@yahoo.com mailto:ashodnakash...@yahoo.com wrote

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 9:22 AM, Geoffrey Garen gga...@apple.com wrote: Rather than asking for a switch to git by fiat, why not improve git and our git-related infrastructure to the point where people choose to switch naturally? The fact that many valuable contributors choose not to use git is

Re: [webkit-dev] Moving to Git?

IMO, none of the arguments used here so far seem like a real problem for a switch. Of course, SVN people would have to adapt their workflow and it could take days (no more than that, trust me), but it is for a greater goal at the end. This is an example of what I mean by fiat: Step 1:

Re: [webkit-dev] Moving to Git?

Hi Geoff. I might have missed your point. Who is trying to force you to change something? I would love to understand the other side for sure... On Thu, Mar 8, 2012 at 3:20 PM, Geoffrey Garen gga...@apple.com wrote: IMO, none of the arguments used here so far seem like a real problem for a

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 9:12 PM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 12:04 PM, Adam Treat atr...@rim.com wrote: There is nothing about git that forces you to have multiple branches locally. Good practice, yes, but nothing forcing it. As for the difficulty of

Re: [webkit-dev] Moving to Git?

On Thursday 08 March 2012 17:12:47 Ryosuke Niwa wrote: On Thu, Mar 8, 2012 at 12:04 PM, Adam Treat atr...@rim.com wrote: There is nothing about git that forces you to have multiple branches locally. Good practice, yes, but nothing forcing it. As for the difficulty of resolving conflicts

Re: [webkit-dev] Moving to Git?

...@openbossa.org] Sent: Thursday, March 08, 2012 3:45 PM To: webkit-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? On Thursday 08 March 2012 17:12:47 Ryosuke Niwa wrote: On Thu, Mar 8, 2012 at 12:04 PM, Adam Treat atr...@rim.com wrote: There is nothing about git that forces you

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 12:44 PM, Jochen Eisinger joc...@chromium.org wrote: On Thu, Mar 8, 2012 at 9:12 PM, Ryosuke Niwa rn...@webkit.org wrote: The simplicity. In git, I have to worry about things like committing local changes before rebasing to master, or stashing, etc... In svn, all I

Re: [webkit-dev] Moving to Git?

-dev@lists.webkit.org Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 12:44 PM, Jochen Eisinger joc...@chromium.orgmailto:joc...@chromium.org wrote: On Thu, Mar 8, 2012 at 9:12 PM, Ryosuke Niwa rn...@webkit.orgmailto:rn...@webkit.org wrote: The simplicity. In git, I have to worry

Re: [webkit-dev] Moving to Git?

Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian ashodnakash...@yahoo.commailto:ashodnakash...@yahoo.com wrote: And that's a show stopper for me. For build bot maintenance, regression fixes, etc... being able to easily tell the number of commits

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 2:10 PM, Maciej Stachowiak m...@apple.com wrote: It seems like there are a couple of different issues here that affect how we do version control. Currently we have an SVN primary repository, some contributors use SVN, and others use git via git-svn. It seems like there

Re: [webkit-dev] Moving to Git?

of Ryosuke Niwa [rn...@webkit.org] Sent: Thursday, March 08, 2012 3:00 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 11:24 AM, Ashod Nakashian ashodnakash...@yahoo.commailto:ashodnakash...@yahoo.com wrote: And that's a show stopper

Re: [webkit-dev] Moving to Git?

On Fri, Mar 9, 2012 at 8:25 AM, Ryosuke Niwa rn...@webkit.org wrote: On Thu, Mar 8, 2012 at 1:19 PM, Joe Mason jma...@rim.com wrote: What Ryosuke seems to be complaining about is that if you have changes to your working copy, svn up will automatically merge them, which could lead to

Re: [webkit-dev] Moving to Git?

? From: webkit-dev-boun...@lists.webkit.org [webkit-dev-boun...@lists.webkit.org] on behalf of Ryosuke Niwa [rn...@webkit.org] Sent: Thursday, March 08, 2012 3:00 PM To: Ashod Nakashian Cc: WebKit Development Subject: Re: [webkit-dev] Moving to Git? On Thu, Mar 8, 2012 at 11:24 AM

Re: [webkit-dev] Moving to Git?

Am 08.03.2012 um 23:30 schrieb Alexis Menard: On Thu, Mar 8, 2012 at 7:10 PM, Maciej Stachowiak m...@apple.com wrote: It seems like there are a couple of different issues here that affect how we do version control. Currently we have an SVN primary repository, some contributors use SVN, and

Re: [webkit-dev] Moving to Git?

On Thu, Mar 8, 2012 at 2:37 PM, David Barr davidb...@google.com wrote: The monotonic labels that Ryosuke desires are known in git language as generation numbers. If we maintain a canonical linear history going forward, they would also be unique as with Subversion. This could be a good reason

Re: [webkit-dev] Moving to Git?

I think it would look the same, except for instead of monotonically increasing decimal numbers in the revision column, you'd see random hexadecimal ones (typically 6-8 digits long). On Thu, Mar 8, 2012 at 4:20 PM, Lucas Forschler lforsch...@apple.com wrote: Could someone enlighten me on what