regress/cmdline/rebase.sh


Log

Author Commit Date CI Message
Stefan Sperling 993f033b 2021-07-16T11:07:29 make 'got ref -d' print reference name and value like the new -X options do
Stefan Sperling 643b85bc 2021-07-16T10:47:10 new -X option for removing backups created by got rebase and got histedit ok semarie
Stefan Sperling 54d5be07 2021-06-03T13:12:58 fix unrelated changes being merged by got cherrypick/backout/rebase/histedit This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.
Stefan Sperling 9e822917 2021-03-23T11:39:17 rebase/histedit -l: error out if no backups for the requested branch exist
Stefan Sperling e600f124 2021-03-21T19:09:35 ensure that old commits remain referenced after rebase and histedit Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick
Stefan Sperling df3ed485 2021-01-31T11:57:10 simplify the error message shown when 'got rebase' has nothing to do
Stefan Sperling 54c39596 2020-12-28T17:38:34 use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
Stefan Sperling a615e0e7 2020-12-16T00:08:58 implicitly mark all files in work tree as up-to-date after rebase/histedit This should always be correct, since rebase and histedit start out with a clean and single-base-commit worktree, and end up committing all changes across the entire work tree when they are successful. tested by jrick and myself
Christian Weisgerber f6cae3ed 2020-09-13T14:05:17 switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp
Stefan Sperling 7fb414ae 2020-08-08T07:34:47 add a -q option to tests for quiet output and use it for 'make regress' Previous default output remains when test cases are run individually. ok tracey
Stefan Sperling 70551d57 2020-04-24T16:23:39 add a test for rebase file index corruption problem fix in previous commit ok tracey
Stefan Sperling 9627c110 2020-04-18T18:40:01 show a summary of conflicts and related problems after updating/merging files ok millert@
Stefan Sperling a740a1b3 2020-03-22T19:42:48 use 'got commit' in test_rebase_delete_missing_file instead of Git
Stefan Sperling ca6da77d 2020-03-22T19:25:28 add a test for 'got rebase' to check behaviour on delete vs. delete
Stefan Sperling e31abbf2 2020-03-22T14:21:06 add -c option to 'got ref' which now expects just one argument after options
Stefan Sperling a0ea4fc0 2020-02-28T17:37:53 show merged commit ID + logmsg upon merge conflict during rebase and histedit This makes it more apparent which commit contained the conflicting change. The new output looks like this: C sys/dev/pci/if_iwm.c 8a98d848a1a5 -> merge conflict: properly modify station queues got: conflicts must be resolved before rebasing can continue
Stefan Sperling da76fce2 2020-02-24T20:31:09 let 'got branch' switch and update the work tree ok tracey
Stefan Sperling 1ae0a341 2020-02-14T15:43:03 add a test which ensures that 'got rebase' trims empty dirs from disk
Stefan Sperling 5aa81393 2020-01-06T19:38:23 add copyright year for files already touched in 2020
Stefan Sperling e51d7b55 2020-01-04T08:35:17 prevent rebase with an out-of-date work tree
Stefan Sperling 38b0338b 2019-11-29T03:57:10 if there are no commits to rebase, just forward the rebased branch's reference Problem found by kn@
Stefan Sperling f69721c3 2019-10-21T09:04:57 show base commit hash and omit filenames in conflict markers
Stefan Sperling d136cfcb 2019-10-12T07:33:12 show original file content in conflict markers
Stefan Sperling fc66b545 2019-08-12T14:45:02 fix behaviour of 'got rebase' with no commits to rebase; with semarie@
Stefan Sperling f032f1f7 2019-08-04T14:10:07 fix and test interaction of rebase/histedit -c and 'got stage'
Stefan Sperling 11495e04 2019-07-12T20:12:06 tweak 'got rebase' conflict error message
Stefan Sperling 4ba9c4f6 2019-07-11T22:43:29 fix wrong sandbox name used by a rebase test
Stefan Sperling 787c8eb6 2019-07-11T22:40:44 fix extra whitespace in rebased log messages Trim leading and trailing whitespace from log messages when creating commits. Fixes a rebase issue but should be a good idea in general.
Stefan Sperling 64c6d990 2019-07-11T16:37:36 prevent rebase in a work tree with an incompatible path prefix
Stefan Sperling 7d5807f4 2019-07-11T14:57:24 disallow 'got update' and 'got commit' while rebase is in progress
Stefan Sperling dcf44d04 2019-07-11T14:45:25 revert accidental change; run all rebase tests again
Stefan Sperling ff0d2220 2019-07-11T13:59:20 handle no-op changes during 'got rebase -c'
Stefan Sperling 818c7501 2019-07-10T18:23:39 initial 'got rebase' implementation