Move noms-merge into noms commit tool

[cmasone-attic]

The new interface will be:

noms merge [--policy=l|r|a] [--out-ds-name=<name>] [--parent=<obj>] <db-spec> <left-obj> <right-obj>

  <db-spec>   : database in which named datasets live
  <left-obj>  : path to an object descending from <parent>
  <right-obj> : path to an object descending from <parent>

See Spelling Objects at https://github.com/attic-labs/noms/blob/master/doc/spelling.md for details on the <db-spec>, <left-obj>, <right-obj> and --parent arguments.

Flags:

--policy
    If unset, any merge conflict is fatal. Can be set to one of 'l', 'r', or 'a' which will resolve conflicts by choosing the Value from <left-obj>, <right-obj>, or asking the user respectively
--out-ds-name (= "")
    output dataset to write to - if empty, defaults to printing the hash of the merged object to stdout
--parent (= "")
    common ancestor of <left-obj> and <right-obj> (required unless left-obj and right-obj are Datasets)
--quiet  (= false)
    silence progress output

[cmasone-attic]

@aboodman The above is the current, desired API, right?

[aboodman]

Hm, the idea of this creating its own commit seems in conflict with factoring out noms commit. But it's required in the case where the inputs are datasets, if you want to reflect the merge by having two parents in the merge commit.

[aboodman]

Ideas? @rafael-atticlabs ?

[cmasone-attic]

I mean...it can still craft the merge Commit and emit the hash of that object. Then noms commit just needs to understand what to do if it sees that the hash is already a Commit?

[aboodman]

I mean what metadata will it put there?

On Thu, Sep 8, 2016 at 1:26 PM, cmasone-attic notifications@github.com
wrote:

I mean...it can still craft the merge Commit and emit the hash of that
object. Then noms commit just needs to understand what to do if it sees
that the hash is already a Commit?

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#2535 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAE6BNcrX7yvjEVWnoneUAKwgDbBlBCpks5qoG9mgaJpZM4J4YOs
.

[cmasone-attic]

hm. true. Open to ideas :-)

[aboodman]

Also it wont actually work with commit because commit (as currently being
implemented) because both tools think they are the ones building the commit.

On Thu, Sep 8, 2016 at 1:32 PM, Aaron Boodman aa@attic.io wrote:

I mean what metadata will it put there?

On Thu, Sep 8, 2016 at 1:26 PM, cmasone-attic notifications@github.com
wrote:

I mean...it can still craft the merge Commit and emit the hash of that
object. Then noms commit just needs to understand what to do if it sees
that the hash is already a Commit?

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#2535 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAE6BNcrX7yvjEVWnoneUAKwgDbBlBCpks5qoG9mgaJpZM4J4YOs
.

[cmasone-attic]

POR: noms commit --merge or similar. I'll flesh out what the command line args should look like once I look at noms commit in more detail