mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 10:35:57 +03:00
delete child-namespace-history-merge.md
This commit is contained in:
Mitchell Rosen
parent
13558c91e8
commit
93fc35e2c7
@ -1,99 +0,0 @@
|
||||
# Behaviour of namespace histories during a merge.
|
||||
|
||||
Note: This is a descriptive test meant to capture the current behaviour of
|
||||
branch histories during a merge.
|
||||
It isn't prescriptive about how merges _should_ work with respect to child branches,
|
||||
but I think we should at least notice if we change things by accident.
|
||||
|
||||
|
||||
## Setting up some history
|
||||
|
||||
```ucm:hide
|
||||
.> builtins.merge
|
||||
```
|
||||
|
||||
```unison:hide
|
||||
parent.top = "top"
|
||||
parent.child.thing = "parent.child.thing"
|
||||
```
|
||||
|
||||
The child branch has a single history node representing the addition of `parent.child.thing`.
|
||||
|
||||
```ucm
|
||||
.> add
|
||||
.> history parent.child
|
||||
```
|
||||
|
||||
If we add another thing to the child namespace it should add another history node to both the child and parent.
|
||||
|
||||
```unison:hide
|
||||
parent.child.thing2 = "parent.child.thing2"
|
||||
```
|
||||
|
||||
```ucm
|
||||
.> add
|
||||
.> history parent
|
||||
.> history parent.child
|
||||
```
|
||||
|
||||
## Forking off some history on a separate branch
|
||||
|
||||
Now we fork the parent namespace to make some changes.
|
||||
|
||||
```ucm
|
||||
.> fork parent parent_fork
|
||||
```
|
||||
|
||||
```unison:hide
|
||||
parent_fork.child.thing3 = "parent_fork.child.thing3"
|
||||
```
|
||||
|
||||
The child should have a new history node after adding `thing3`
|
||||
|
||||
```ucm
|
||||
.> add
|
||||
.> history parent_fork.child
|
||||
```
|
||||
|
||||
## Saving our parent state
|
||||
|
||||
Split off two separate forks, one for testing squash merges, one for standard merges.
|
||||
|
||||
```ucm:hide
|
||||
.> fork parent parent_squash_base
|
||||
.> fork parent parent_merge_base
|
||||
```
|
||||
|
||||
## Squash merge
|
||||
|
||||
For a squash merge, when I squash-merge back into parent, we expect `parent_fork.child.thing3` to be added.
|
||||
|
||||
```ucm
|
||||
.> merge.old.squash parent_fork parent_squash_base
|
||||
.> history parent_squash_base
|
||||
```
|
||||
|
||||
Notice that with the current behaviour, the history of `parent.child` is completely wiped out, containing nothing from the source OR destination.
|
||||
|
||||
```ucm
|
||||
.> history parent.child
|
||||
.> history parent_fork.child
|
||||
.> history parent_squash_base.child
|
||||
```
|
||||
|
||||
## Standard merge
|
||||
|
||||
For a standard merge, if I merge back into parent, we expect `parent_fork.child.thing3` to be added.
|
||||
|
||||
```ucm
|
||||
.> merge.old parent_fork parent_merge_base
|
||||
.> history parent_merge_base
|
||||
```
|
||||
|
||||
Child histories should also be *merged*.
|
||||
|
||||
```ucm
|
||||
.> history parent.child
|
||||
.> history parent_fork.child
|
||||
.> history parent_merge_base.child
|
||||
```
|
||||
@ -1,302 +0,0 @@
|
||||
# Behaviour of namespace histories during a merge.
|
||||
|
||||
Note: This is a descriptive test meant to capture the current behaviour of
|
||||
branch histories during a merge.
|
||||
It isn't prescriptive about how merges _should_ work with respect to child branches,
|
||||
but I think we should at least notice if we change things by accident.
|
||||
|
||||
|
||||
## Setting up some history
|
||||
|
||||
```unison
|
||||
parent.top = "top"
|
||||
parent.child.thing = "parent.child.thing"
|
||||
```
|
||||
|
||||
The child branch has a single history node representing the addition of `parent.child.thing`.
|
||||
|
||||
```ucm
|
||||
.> add
|
||||
|
||||
⍟ I've added these definitions:
|
||||
|
||||
parent.child.thing : Text
|
||||
parent.top : Text
|
||||
|
||||
.> history parent.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
|
||||
|
||||
□ 1. #0r73mam57g (start of history)
|
||||
|
||||
```
|
||||
If we add another thing to the child namespace it should add another history node to both the child and parent.
|
||||
|
||||
```unison
|
||||
parent.child.thing2 = "parent.child.thing2"
|
||||
```
|
||||
|
||||
```ucm
|
||||
.> add
|
||||
|
||||
⍟ I've added these definitions:
|
||||
|
||||
parent.child.thing2 : Text
|
||||
|
||||
.> history parent
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #2hv7t9lp40
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
child.thing2
|
||||
|
||||
□ 2. #i9lji1bli0 (start of history)
|
||||
|
||||
.> history parent.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 2. #0r73mam57g (start of history)
|
||||
|
||||
```
|
||||
## Forking off some history on a separate branch
|
||||
|
||||
Now we fork the parent namespace to make some changes.
|
||||
|
||||
```ucm
|
||||
.> fork parent parent_fork
|
||||
|
||||
Done.
|
||||
|
||||
```
|
||||
```unison
|
||||
parent_fork.child.thing3 = "parent_fork.child.thing3"
|
||||
```
|
||||
|
||||
The child should have a new history node after adding `thing3`
|
||||
|
||||
```ucm
|
||||
.> add
|
||||
|
||||
⍟ I've added these definitions:
|
||||
|
||||
parent_fork.child.thing3 : Text
|
||||
|
||||
.> history parent_fork.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #9rcfgbsp81
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing3
|
||||
|
||||
⊙ 2. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 3. #0r73mam57g (start of history)
|
||||
|
||||
```
|
||||
## Saving our parent state
|
||||
|
||||
Split off two separate forks, one for testing squash merges, one for standard merges.
|
||||
|
||||
## Squash merge
|
||||
|
||||
For a squash merge, when I squash-merge back into parent, we expect `parent_fork.child.thing3` to be added.
|
||||
|
||||
```ucm
|
||||
.> merge.old.squash parent_fork parent_squash_base
|
||||
|
||||
Here's what's changed in parent_squash_base after the merge:
|
||||
|
||||
Added definitions:
|
||||
|
||||
1. child.thing3 : Text
|
||||
|
||||
Tip: You can use `todo` to see if this generated any work to
|
||||
do in this namespace and `test` to run the tests. Or you
|
||||
can use `undo` or `reflog` to undo the results of this
|
||||
merge.
|
||||
|
||||
Applying changes from patch...
|
||||
|
||||
.> history parent_squash_base
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #594e0e1p39
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
child.thing3
|
||||
|
||||
⊙ 2. #2hv7t9lp40
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
child.thing2
|
||||
|
||||
□ 3. #i9lji1bli0 (start of history)
|
||||
|
||||
```
|
||||
Notice that with the current behaviour, the history of `parent.child` is completely wiped out, containing nothing from the source OR destination.
|
||||
|
||||
```ucm
|
||||
.> history parent.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 2. #0r73mam57g (start of history)
|
||||
|
||||
.> history parent_fork.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #9rcfgbsp81
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing3
|
||||
|
||||
⊙ 2. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 3. #0r73mam57g (start of history)
|
||||
|
||||
.> history parent_squash_base.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
|
||||
|
||||
□ 1. #19fd4mhpp4 (start of history)
|
||||
|
||||
```
|
||||
## Standard merge
|
||||
|
||||
For a standard merge, if I merge back into parent, we expect `parent_fork.child.thing3` to be added.
|
||||
|
||||
```ucm
|
||||
.> merge.old parent_fork parent_merge_base
|
||||
|
||||
Here's what's changed in parent_merge_base after the merge:
|
||||
|
||||
Added definitions:
|
||||
|
||||
1. child.thing3 : Text
|
||||
|
||||
Tip: You can use `todo` to see if this generated any work to
|
||||
do in this namespace and `test` to run the tests. Or you
|
||||
can use `undo` or `reflog` to undo the results of this
|
||||
merge.
|
||||
|
||||
Applying changes from patch...
|
||||
|
||||
.> history parent_merge_base
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #mtn8sha7gd
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
child.thing3
|
||||
|
||||
⊙ 2. #2hv7t9lp40
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
child.thing2
|
||||
|
||||
□ 3. #i9lji1bli0 (start of history)
|
||||
|
||||
```
|
||||
Child histories should also be *merged*.
|
||||
|
||||
```ucm
|
||||
.> history parent.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 2. #0r73mam57g (start of history)
|
||||
|
||||
.> history parent_fork.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #9rcfgbsp81
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing3
|
||||
|
||||
⊙ 2. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 3. #0r73mam57g (start of history)
|
||||
|
||||
.> history parent_merge_base.child
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #9rcfgbsp81
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing3
|
||||
|
||||
⊙ 2. #ggnrs01131
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
thing2
|
||||
|
||||
□ 3. #0r73mam57g (start of history)
|
||||
|
||||
```
|
||||
Loading…
Reference in New Issue
Block a user