mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-02 11:30:13 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity
9,600 Commits 299 Branches 629 Tags
1ab4f68db64d9a5b2516272cc147092d239a3fbe
Commit Graph

9600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Musgrave 1ab4f68db6 Slightly more robust test 2021-08-02 17:31:33 -07:00
Zach Musgrave 677b7d5cd7 Fixed panic in merging a branch that still contains a table that was deleted in our root 2021-08-02 17:25:35 -07:00
Zach Musgrave 9ce9d5e0b4 More tests, and fixed most of the deleted table problems in merge 2021-08-02 17:14:29 -07:00
Zach Musgrave cbabc4a136 Refactoring merge table method for readability 2021-08-02 15:29:56 -07:00
Zach Musgrave c794bf0103 Fixed some documentation typos 2021-08-02 14:14:07 -07:00
Zach Musgrave 6c55b14ecb New merge tests, including two panics 2021-08-02 14:07:23 -07:00
AndyA c5efbd8d3e Merge pull request #1960 from dolthub/andy/closure-common-ancestor 
Find common ancestor using transitive ref closure
 2021-08-02 08:59:49 -07:00
Andy Arthur 98255f6797 fix copyright header 2021-08-02 08:40:39 -07:00
Andy Arthur 9cdfc0e639 doc comments 2021-08-01 20:22:40 -07:00
Andy Arthur 4344cc7c93 fix private return type 2021-07-31 11:37:26 -07:00
Andy Arthur 3ebf3cd1f9 fix typo 2021-07-31 11:34:57 -07:00
Andy Arthur 61d09f56a9 added lazy ref closure 2021-07-31 11:15:31 -07:00
Andy Arthur d9b5509e3d find common ancestor using transitive ref closure 2021-07-31 10:50:29 -07:00
Zach Musgrave 58bf08407a Update roadmap.md 2021-07-30 16:55:35 -07:00
Zach Musgrave dd5f99df1a Update faq.md 2021-07-30 16:55:06 -07:00
Zach Musgrave ec97fbb436 Update faq.md 2021-07-30 16:54:44 -07:00
Maximilian Hoffman 903684b6c8 Max/push panic (#1959) 
* Fix push panic

* Fmt
 2021-07-30 13:24:12 -07:00
Aaron Son d57a17733d Merge pull request #1951 from dolthub/aaron/improve-branch-edit-workingset-management 
go: env/actions/branch: Move and delete branch also update working sets.
 2021-07-30 12:34:32 -07:00
Aaron Son ed25a7149d go: doltdb: Add a method comment to DoltDB.CopyWorkingSet. 2021-07-30 12:33:16 -07:00
andrew-wm-arthur fcf5fa814e [ga-bump-release] Update Dolt version to 0.27.1 and release v0.27.1 v0.27.1 2021-07-30 02:06:37 +00:00
AndyA 154370c3d8 Merge pull request #1958 from dolthub/andy/stage-with-conflicts 
[no-release-notes] Remove conflict/constraint checks from staging
 2021-07-29 19:02:50 -07:00
Andy Arthur 6a37b7e12d update test 2021-07-29 18:32:08 -07:00
Andy Arthur 221f0ae258 pr feedback 2021-07-29 18:01:04 -07:00
Andy Arthur 0f97c93811 func docs 2021-07-29 17:55:30 -07:00
Andy Arthur ee63506d2e rename function 2021-07-29 17:54:20 -07:00
Andy Arthur cf47e0cc2a putting conflict/constraint pruning logic back 2021-07-29 17:53:34 -07:00
Andy Arthur 1a1b051f27 more test updates 2021-07-29 17:29:57 -07:00
Andy Arthur 7571fc46c4 update test 2021-07-29 17:21:06 -07:00
Andy Arthur 723607870e remove conflict/constraint checks from staging 2021-07-29 17:13:01 -07:00
Zach Musgrave b2f6e9df48 Merge pull request #1957 from dolthub/zachmu/session-vars 
Allow setting head ref session var, e.g. @@mydb_head_ref to change branches
 2021-07-29 17:10:59 -07:00
Zach Musgrave e320ec692e Removed custom session var management during session.AddDB, moved it all to setSessionVarsForDb 2021-07-29 16:42:20 -07:00
Zach Musgrave a367bda243 Fixed dolt_checkout to correctly update the head ref var, added a bats test 2021-07-29 16:24:35 -07:00
Zach Musgrave e54107bc74 Allow switching branches by setting the head ref system variable. Added a bats test 2021-07-29 15:51:51 -07:00
Zach Musgrave c674d817a8 bats test for switching heads with a session var 2021-07-29 15:43:56 -07:00
Zach Musgrave 2091b10b48 Merge pull request #1949 from dolthub/zachmu/use-branch 
Branch and commit-qualified database names enabled by default
 2021-07-29 14:46:37 -07:00
Daylon Wilkins fb7759009e Merge pull request #1955 from dolthub/Hydrocharged-aca74186 
[auto-bump] [no-release-notes] dependency by Hydrocharged
 2021-07-29 14:32:11 -07:00
Aaron Son bb90b57e9a Merge pull request #1954 from dolthub/aaron/commitwalk-cache-meta 
go/libraries/doltcore/env/actions/commitwalk: Cache commit meta during the topological walk to avoid n^2 work materializing it over and over.
 2021-07-29 14:22:42 -07:00
Daylon Wilkins 6148bded9d Changed commit force to ignore conflicts and constraint violations 2021-07-29 14:12:59 -07:00
Hydrocharged 87cde98422 [ga-bump-dep] Bump dependency in Dolt by Hydrocharged 2021-07-29 20:57:21 +00:00
Aaron Son 3f1977561d Iterate on bats/branch.bats for windows. 2021-07-29 13:51:47 -07:00
Aaron Son 40596d4c53 go/libraries/doltcore/env/actions/commitwalk: Cache commit meta during the topological walk to avoid n^2 work materializing it over and over. 2021-07-29 13:49:15 -07:00
Zach Musgrave 856c7256c4 Fixed a couple typos 2021-07-29 12:56:47 -07:00
Aaron Son b561946f86 go: env/actions/branch: When moving a branch, also move its working set. 2021-07-29 11:11:23 -07:00
Zach Musgrave 1fa0f2b644 Merge branch 'zachmu/use-branch' of github.com:dolthub/dolt into zachmu/use-branch 2021-07-28 18:39:29 -07:00
Zach Musgrave 4c7f804563 Added a server test for connecting to database at a commit hash. Added the ability to assert an exception string in the python script 2021-07-28 18:39:20 -07:00
Zach Musgrave 2655b0d495 Fixed test failing due to new default 2021-07-28 16:37:30 -07:00
Aaron Son 5427c4e408 go: env/actions/branch: When deleting a branch, also delete its working set ref. 2021-07-28 16:23:18 -07:00
zachmu 2e5b38b60e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-07-28 21:48:31 +00:00
Vinai Rachakonda fe231a0ad1 Vinai/dolt merge ret type (#1941) 
Change dolt merge ret type
 2021-07-28 14:10:56 -07:00
Zach Musgrave 82ed59272e Tests for read-only error cases 2021-07-28 12:19:31 -07:00