--- a/tests/test-divergent.t Wed Jun 06 14:35:36 2018 +0200
+++ b/tests/test-divergent.t Tue Jun 05 21:02:09 2018 +0530
@@ -32,107 +32,133 @@
$ hg init test1
$ cd test1
- $ mkcommits _a _b
- $ hg up "desc(_a)"
+ $ echo a > a
+ $ hg ci -Aqm "added a"
+ $ echo b > b
+ $ hg ci -Aqm "added b"
+
+ $ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ mkcommit bdivergent1
+ $ echo bdivergent > bdivergent1
+ $ hg ci -Am "divergent1"
+ adding bdivergent1
created new head
- $ hg up "desc(_a)"
+
+ $ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ mkcommit bdivergent2
+ $ echo bdivergent > bdivergent2
+ $ hg ci -Am "divergent2"
+ adding bdivergent2
created new head
- $ hg prune -s "desc(bdivergent1)" "desc(_b)"
+
+ $ hg prune -s "desc(divergent1)" "desc('added b')"
1 changesets pruned
- $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
+ $ hg prune -s "desc(divergent2)" "desc('added b')" --hidden
1 changesets pruned
2 new content-divergent changesets
+
$ hg log -G
- @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
+ @ 3:527aaa00354a@default(draft) divergent2 [content-divergent]
|
- | * 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+ | * 2:e97948280e0f@default(draft) divergent1 [content-divergent]
|/
- o 0:135f39f4bd78@default(draft) add _a []
+ o 0:9092f1db7931@default(draft) added a []
+
$ hg evolve --all --any --content-divergent
- merge:[2] add bdivergent1
- with: [3] add bdivergent2
- base: [1] add _b
- updating to "local" side of the conflict: c2f698071cba
- merging "other" content-divergent changeset 'e708fd28d5cf'
+ merge:[2] divergent1
+ with: [3] divergent2
+ base: [1] added b
+ updating to "local" side of the conflict: e97948280e0f
+ merging "other" content-divergent changeset '527aaa00354a'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at c26f1d3baed2
+ working directory is now at bcd04eb3c8c5
$ hg log -G
- @ 4:c26f1d3baed2@default(draft) add bdivergent1 []
+ @ 4:bcd04eb3c8c5@default(draft) divergent1 []
|
- o 0:135f39f4bd78@default(draft) add _a []
+ o 0:9092f1db7931@default(draft) added a []
Test divergence resolution when it yields to an empty commit (issue4950)
cdivergent2 contains the same content than cdivergent1 and they are divergent
versions of the revision _c
- $ hg up "desc(_a)"
+ $ hg up .^
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit _c
created new head
- $ hg up "desc(_a)"
+
+ $ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit cdivergent1
created new head
- $ hg up "desc(_a)"
+
+ $ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "cdivergent1" > cdivergent1
$ hg add cdivergent1
$ hg ci -m "cdivergent2"
created new head
+
$ hg prune -s "desc(cdivergent1)" "desc(_c)"
1 changesets pruned
$ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden
1 changesets pruned
2 new content-divergent changesets
+
$ hg log -G
- @ 7:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
+ @ 7:8debdf3c1fbd@default(draft) cdivergent2 [content-divergent]
|
- | * 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
+ | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
|/
- | o 4:c26f1d3baed2@default(draft) add bdivergent1 []
+ | o 4:bcd04eb3c8c5@default(draft) divergent1 []
|/
- o 0:135f39f4bd78@default(draft) add _a []
+ o 0:9092f1db7931@default(draft) added a []
$ hg evolve --all --any --content-divergent
merge:[6] add cdivergent1
with: [7] cdivergent2
base: [5] add _c
- updating to "local" side of the conflict: 26c7705fee96
- merging "other" content-divergent changeset '0a768ef678d9'
+ updating to "local" side of the conflict: e3ff64ce8d4c
+ merging "other" content-divergent changeset '8debdf3c1fbd'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing changed
- working directory is now at 26c7705fee96
+ working directory is now at e3ff64ce8d4c
+
+ $ cd ..
Test None docstring issue of evolve divergent, which caused hg crush
$ hg init test2
$ cd test2
$ mkcommits _a _b
- $ hg up "desc(_a)"
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ mkcommit bdivergent1
- created new head
- $ hg up "desc(_a)"
+
+ $ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ mkcommit bdivergent2
+ $ echo bdivergent > bdivergent11
+ $ hg ci -Am "bdivergent11"
+ adding bdivergent11
created new head
- $ hg prune -s "desc(bdivergent1)" "desc(_b)"
+
+ $ hg up .^
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo bdivergent > bdivergent22
+ $ hg ci -Am "bdivergent22"
+ adding bdivergent22
+ created new head
+
+ $ hg prune -s "desc(bdivergent11)" "desc(_b)"
1 changesets pruned
- $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
+ $ hg prune -s "desc(bdivergent22)" "desc(_b)" --hidden
1 changesets pruned
2 new content-divergent changesets
$ hg log -G
- @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
+ @ 3:31e50386b33b@default(draft) bdivergent22 [content-divergent]
|
- | * 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+ | * 2:4bcc9397dfb9@default(draft) bdivergent11 [content-divergent]
|/
o 0:135f39f4bd78@default(draft) add _a []
+
$ cat >$TESTTMP/test_extension.py << EOF
> from mercurial import merge
> origupdate = merge.update
@@ -149,12 +175,11 @@
(do you want to use --content-divergent)
[2]
$ hg evolve --content-divergent
- merge:[3] add bdivergent2
- with: [2] add bdivergent1
+ merge:[3] bdivergent22
+ with: [2] bdivergent11
base: [1] add _b
- merging "other" content-divergent changeset 'c2f698071cba'
+ merging "other" content-divergent changeset '4bcc9397dfb9'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory is now at aa26817f6fbe
-
+ working directory is now at 1a7876768e59
$ cd ..