mafintosh: i think substack has the right idea, and it might be related to the discussion seen here about whether or not to make --force default behavior when updating data https://github.com/maxogden/dat/issues/127
mafintosh
karissa: isn't --force default just a merge strategy though?
karissa
mafintosh: well, the idea being that we should trust the user -- any data that they're inserting into the database should be the 'new' data. older data should be versioned but retrievable
so there aren't really conflicts
does that make sense?
mafintosh
karissa: hmm not sure - it still sounds like a merge strategy to me. if you wanted to do something like that i guess you would have to rely on timestamps or something? (the merge strategy here being "pick the one with the highest timestamp")
karissa
mafintosh: perhaps. its just a concept, yknow. maybe timestamp isn't the necessary thing, but essentially 'order of operations' should prevail -- so new data overwrites old
mafintosh
karissa: i get your point :) but we can't always guarantee order of operations since we are distributed. there isn't really a single source of thruth
paulfitz joined the channel
karissa
mafintosh: yeah, heh. maybe it'd make sense to step back a minute and get a couple examples running and see what the user experience would be like, ideally.
robstory has quit
by 'running' i don't mean actually setting up a dat/having code, but just sketching it out
docs are still lacking but the interface should be somewhat stable now
paulfitz joined the channel
robstory joined the channel
substack
mafintosh: mafintosh there is always a local order of operations
I think maybe just exposing which versions are the most recent prominently in the ui (the heads) would be adequate
and then just rely on the local order of operations to show the "default" view
but the need for a "default" view that "wins" is an artificial constraint imposed by the ui
mafintosh
i think i would prefer always showing all versions + having an explicit merge function that would combine versions to a new single version instead of having a default view
since that view would very between users
karissa
we should really be thinking about this from the perspective of a concrete example proposal that reflects a real-world situation
otherwise we will go in circles and land on the wrong target
substack
mafintosh: yes I think that would work best
karissa: suppose you pull from mafintosh but both of you have new commits based on a common ancestor
in the couchdb/git way, the operation will fail and go into conflict resolution mode right away
in another possible way, you just see mafintosh's edits in a separate view in the ui
and you can run an explicit merge operation to combine your edits with mafintosh's edits
therealkoopa has quit
tphummel has quit
robstory has quit
therealkoopa joined the channel
robstory joined the channel
therealkoopa has quit
shama has quit
captn_noob has quit
tphummel joined the channel
jarofghosts is now known as zz_jarofghosts
tphummel has quit
tphummel joined the channel
tphummel has quit
pfraze joined the channel
paulfitz has quit
robstory has quit
mchelen has quit
yoshuawu1 joined the channel
yoshuawuyts1 joined the channel
xAt is now known as xat-
yoshuawu1 has quit
yoshuawuyts1 has quit
floppy joined the channel
floppy has quit
floppy joined the channel
floppy joined the channel
floppy has quit
yoshuawuyts1 joined the channel
yoshuawu1 joined the channel
pfraze joined the channel
floppy joined the channel
pfraze has quit
floppy has quit
floppy joined the channel
floppy has quit
floppy joined the channel
floppy has quit
floppy joined the channel
floppy has quit
floppy joined the channel
floppy joined the channel
floppy has quit
sfkeller joined the channel
floppy joined the channel
therealkoopa joined the channel
mchelen joined the channel
saebekassebil joined the channel
mhilmi_ has quit
mhilmi_ joined the channel
dat-git-bot
[dat] ajschumacher opened pull request #276: correct ESGF link (master...patch-1) http://git.io/FRdK
newScrollback has quit
xat- is now known as xAt
pfraze joined the channel
pfraze has quit
saebekassebil has quit
pfraze joined the channel
floppy has quit
saebekassebil joined the channel
floppy joined the channel
captn_noob joined the channel
floppy has quit
pfraze has quit
floppy joined the channel
floppy has quit
shama joined the channel
paulfitz joined the channel
floppy joined the channel
floppy has quit
floppy joined the channel
robstory joined the channel
pfraze joined the channel
zz_jarofghosts is now known as jarofghosts
saebekassebil has quit
ogd
mafintosh: karissa melanie finnp_ call in 10 mins!
mafintosh
on it (finishing me demo)
yoshuawu1 has quit
yoshuawuyts1 has quit
sfkeller has quit
sfkeller joined the channel
karissa
great!
tphummel joined the channel
ogd
mafintosh: also can you put the hangout link here (not the youtube link)