 Zach Musgrave
|
f60ee9ca0d
|
Fix commit for active merge bug I introduced
|
2021-08-04 15:58:58 -07:00 |
|
|
Zach Musgrave
|
2c4b068f66
|
Cleared out the merge state in a few more places it was needed
|
2021-08-04 15:31:03 -07:00 |
|
|
Zach Musgrave
|
0a2521bdc8
|
Got rid of the final two misplaced methods on RepoStateReader
|
2021-08-04 15:08:15 -07:00 |
|
|
Zach Musgrave
|
45a891e221
|
Removed unused method
|
2021-08-04 10:10:50 -07:00 |
|
|
Zach Musgrave
|
75dd2a58c7
|
Merge branch 'master' into zachmu/cleanup
|
2021-08-04 09:58:07 -07:00 |
|
|
AndyA
|
fefabca3eb
|
Merge pull request #1975 from dolthub/vinai/slight-bats-edit
[no-release-notes] Vinai/slight bats edit
|
2021-08-04 09:44:37 -07:00 |
|
|
andrew-wm-arthur
|
8de4ac62b1
|
[ga-bump-release] Update Dolt version to 0.27.2 and release v0.27.2
v0.27.2
|
2021-08-04 16:31:47 +00:00 |
|
|
Vinai Rachakonda
|
6a1c5ded21
|
nits
|
2021-08-03 18:19:26 -07:00 |
|
|
Vinai Rachakonda
|
e0405cd347
|
updt tests
|
2021-08-03 18:14:52 -07:00 |
|
|
Vinai Rachakonda
|
9d434dc57b
|
Edit dolt merge ret type again (#1967)
|
2021-08-03 17:05:46 -07:00 |
|
|
AndyA
|
a51926d02e
|
Merge pull request #1972 from dolthub/andy/merge-abort-clean-index
Reset staging index on `dolt merge --abort`
|
2021-08-03 15:48:27 -07:00 |
|
|
Zach Musgrave
|
205dffece0
|
Merge pull request #1965 from dolthub/zachmu/panic-at-the-merge-disco
Fixed panic when merging a branch that still contains a table that was deleted in the target
|
2021-08-03 15:29:39 -07:00 |
|
|
Andy Arthur
|
d18c2e8003
|
set stagedRoot = workingRoot in WorkingSet.AbortMerge()
|
2021-08-03 15:19:10 -07:00 |
|
|
Andy Arthur
|
f6c9f227cb
|
added skipped bats to repro dirty index after 'dolt merge --abort'
|
2021-08-03 15:14:54 -07:00 |
|
|
Zach Musgrave
|
6667a78ed7
|
PR feedback
|
2021-08-03 15:05:57 -07:00 |
|
|
Zach Musgrave
|
3a674eee6d
|
Moved a function
|
2021-08-02 17:34:39 -07:00 |
|
|
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 |
|
|
Brian Hendriks
|
76212aae15
|
expose commit parent refs (#1963)
* expose commit parent refs
* no need for ctx
* adding commentt
|
2021-08-02 14:48:59 -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 |
|