222847 2021-03-05 18:55:50 -0800 git-webkit should have equivalent of svn up 2022-01-29 12:50:28 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED https://bugs.webkit.org/show_bug.cgi?id=215862 https://bugs.webkit.org/show_bug.cgi?id=220442 https://bugs.webkit.org/show_bug.cgi?id=229625 https://bugs.webkit.org/show_bug.cgi?id=235861 InRadar P2 Normal --- 1 rniwa webkit-unassigned bdakin ggaren jbedard webkit-bug-importer oldest_to_newest 1736706 0 rniwa 2021-03-05 18:55:50 -0800 We should either make `git-webkit pull` or add a new command which behaves like `svn up`, in that it automatically rebases local uncommitted changes against the latest trunk. 1736714 1 rniwa 2021-03-05 19:11:01 -0800 For this command, it's very important for that I can do the equivalent of mine-full/mine-conflict. The whole git checkout --ours/--theirs business is way too confusing. 1736721 2 rniwa 2021-03-05 19:39:33 -0800 Oh, also very important. We need an equivalent of: svn up -r X Like: git-webkit up -c=<commit-identifier> And that should checkout that exact version of "main" branch without getting into a detached state, creating a new branch, etc... Ideally, this command will also support rN form of Subversion revision so that we can go from Subversion version on trac / bugzilla / etc... straight to checking it out on GitHub clone. 1737092 3 webkit-bug-importer 2021-03-08 08:31:21 -0800 <rdar://problem/75171216> 1737101 4 jbedard 2021-03-08 08:45:45 -0800 We already have `git-webkit checkout <arg>`, which supports identifiers, revisions (in SVN and git-svn) and hashes (in git), but there are some missing pieces to it, namely, how this works when there are local edits. I think avoiding the detached HEAD state is not something we should strive for. `git-webkit checkout <arg>` and `git-webkit pull` should behave in the detached HEAD state (not hard when branches have a defined priority, and ours do). 1737430 5 rniwa 2021-03-08 19:05:37 -0800 (In reply to Jonathan Bedard from comment #4) > We already have `git-webkit checkout <arg>`, which supports identifiers, > revisions (in SVN and git-svn) and hashes (in git), but there are some > missing pieces to it, namely, how this works when there are local edits. That is good to know but does it create a new branch or modify the existing branch? I really want to modify the existing / current branch. > I think avoiding the detached HEAD state is not something we should strive > for. `git-webkit checkout <arg>` and `git-webkit pull` should behave in the > detached HEAD state (not hard when branches have a defined priority, and > ours do). I mean... as long as detached HEAD state doesn't cause any problems with all other tools I have no problem with it. We just need to make sure none of the tools we use result in some kind of obscure error message. 1791154 6 jbedard 2021-09-07 12:23:29 -0700 Addressed this in https://bugs.webkit.org/show_bug.cgi?id=220442 and https://bugs.webkit.org/show_bug.cgi?id=229625, closing this bug 1791161 7 rniwa 2021-09-07 12:40:50 -0700 (In reply to Jonathan Bedard from comment #6) > Addressed this in https://bugs.webkit.org/show_bug.cgi?id=220442 and > https://bugs.webkit.org/show_bug.cgi?id=229625, closing this bug Your bug says update PR request when running git-webkit up. What if I had local uncommitted changes and ran git-webkit up? Does it automatically rebase instead of error'ing out with "there is uncommitted local change" nonsense? 1835304 8 rniwa 2022-01-29 12:50:12 -0800 This issue't resolved still. Tracking it in https://bugs.webkit.org/show_bug.cgi?id=235861