Mercurial > evolve
changeset 4492:91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 10 Apr 2019 17:29:40 +0200 |
| parents | bdaf34903430 |
| children | 32446b7a6e7c |
| files | tests/test-evolve-content-divergent-basic.t |
| diffstat | 1 files changed, 86 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-basic.t Wed Apr 10 16:59:58 2019 +0200 +++ b/tests/test-evolve-content-divergent-basic.t Wed Apr 10 17:29:40 2019 +0200 @@ -43,6 +43,21 @@ $ hg ci -Aqm "added a" $ echo b > b $ hg ci -Aqm "added b" + $ hg export + # HG changeset patch + # User test + # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 + # Node ID 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d + # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 + added b + + diff --git a/b b/b + new file mode 100644 + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +b $ hg up .^ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -50,6 +65,21 @@ $ hg ci -Am "divergent" adding bdivergent1 created new head + $ hg export + # HG changeset patch + # User test + # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 + # Node ID 593c57f2117e33dd0884382f02789d948f548557 + # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 + divergent + + diff --git a/bdivergent1 b/bdivergent1 + new file mode 100644 + --- /dev/null + +++ b/bdivergent1 + @@ -0,0 +1,1 @@ + +bdivergent $ hg up .^ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -57,6 +87,21 @@ $ hg ci -Am "divergent" adding bdivergent2 created new head + $ hg export + # HG changeset patch + # User test + # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 + # Node ID 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 + # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 + divergent + + diff --git a/bdivergent2 b/bdivergent2 + new file mode 100644 + --- /dev/null + +++ b/bdivergent2 + @@ -0,0 +1,1 @@ + +bdivergent $ hg prune -s 8374d2ddc3a4 "desc('added b')" 1 changesets pruned @@ -64,12 +109,30 @@ 1 changesets pruned 2 new content-divergent changesets - $ hg log -G + $ hg log -G --patch @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] + | diff --git a/bdivergent2 b/bdivergent2 + | new file mode 100644 + | --- /dev/null + | +++ b/bdivergent2 + | @@ -0,0 +1,1 @@ + | +bdivergent | | * 2:593c57f2117e@default(draft) divergent [content-divergent] - |/ + |/ diff --git a/bdivergent1 b/bdivergent1 + | new file mode 100644 + | --- /dev/null + | +++ b/bdivergent1 + | @@ -0,0 +1,1 @@ + | +bdivergent + | o 0:9092f1db7931@default(draft) added a [] + diff --git a/a b/a + new file mode 100644 + --- /dev/null + +++ b/a + @@ -0,0 +1,1 @@ + +a $ hg evolve --all --any --content-divergent @@ -85,6 +148,27 @@ | o 0:9092f1db7931@default(draft) added a [] + $ hg export + # HG changeset patch + # User test + # Date 0 0 + # Thu Jan 01 00:00:00 1970 +0000 + # Node ID 45bf1312f45468b76158b33f8426e6530c8b35b1 + # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 + divergent + + diff --git a/bdivergent1 b/bdivergent1 + new file mode 100644 + --- /dev/null + +++ b/bdivergent1 + @@ -0,0 +1,1 @@ + +bdivergent + diff --git a/bdivergent2 b/bdivergent2 + new file mode 100644 + --- /dev/null + +++ b/bdivergent2 + @@ -0,0 +1,1 @@ + +bdivergent $ cd ..