author | Martin von Zweigbergk <martinvonz@google.com> |
Mon, 22 Apr 2019 22:14:26 -0700 | |
branch | stable |
changeset 4565 | 393a58d71b30 |
parent 4493 | 32446b7a6e7c |
child 4513 | d70db7e455dc |
child 4578 | 75e76141cba2 |
permissions | -rw-r--r-- |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
1 |
======================================================= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
2 |
Tests the resolution of content divergence: basic cases |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
3 |
======================================================= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
4 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
5 |
This file intend to cover basic case of content divergence. See the other test |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
6 |
file for more advanced cases. |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
7 |
|
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
8 |
$ cat >> $HGRCPATH <<EOF |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
9 |
> [alias] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
10 |
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
11 |
> [defaults] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
12 |
> amend=-d "0 0" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
13 |
> fold=-d "0 0" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
14 |
> [web] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
15 |
> push_ssl = false |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
16 |
> allow_push = * |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
17 |
> [phases] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
18 |
> publish = False |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
19 |
> [diff] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
20 |
> git = 1 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
21 |
> unified = 0 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
22 |
> [ui] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
23 |
> logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{troubles}]\n |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
24 |
> [extensions] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
25 |
> EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1630
diff
changeset
|
26 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
27 |
$ mkcommit() { |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
28 |
> echo "$1" > "$1" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
29 |
> hg add "$1" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
30 |
> hg ci -m "add $1" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
31 |
> } |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
32 |
|
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
33 |
$ mkcommits() { |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
34 |
> for i in $@; do mkcommit $i ; done |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
35 |
> } |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
36 |
|
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
37 |
Basic test of divergence: two divergent changesets with the same parents |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
38 |
With --all --any we dedupe the divergent and solve the divergence once |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
39 |
|
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
40 |
$ hg init test1 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
41 |
$ cd test1 |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
42 |
$ echo a > a |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
43 |
$ hg ci -Aqm "added a" |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
44 |
$ echo b > b |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
45 |
$ hg ci -Aqm "added b" |
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
46 |
$ hg export |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
47 |
# HG changeset patch |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
48 |
# User test |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
49 |
# Date 0 0 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
50 |
# Thu Jan 01 00:00:00 1970 +0000 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
51 |
# Node ID 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
52 |
# Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
53 |
added b |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
54 |
|
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
55 |
diff --git a/b b/b |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
56 |
new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
57 |
--- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
58 |
+++ b/b |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
59 |
@@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
60 |
+b |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
61 |
|
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
62 |
$ hg up .^ |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
63 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
64 |
$ echo bdivergent > bdivergent1 |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
65 |
$ hg ci -Am "divergent" |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
66 |
adding bdivergent1 |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
67 |
created new head |
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
68 |
$ hg export |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
69 |
# HG changeset patch |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
70 |
# User test |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
71 |
# Date 0 0 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
72 |
# Thu Jan 01 00:00:00 1970 +0000 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
73 |
# Node ID 593c57f2117e33dd0884382f02789d948f548557 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
74 |
# Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
75 |
divergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
76 |
|
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
77 |
diff --git a/bdivergent1 b/bdivergent1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
78 |
new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
79 |
--- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
80 |
+++ b/bdivergent1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
81 |
@@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
82 |
+bdivergent |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
83 |
|
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
84 |
$ hg up .^ |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
85 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
86 |
$ echo bdivergent > bdivergent2 |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
87 |
$ hg ci -Am "divergent" |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
88 |
adding bdivergent2 |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
89 |
created new head |
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
90 |
$ hg export |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
91 |
# HG changeset patch |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
92 |
# User test |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
93 |
# Date 0 0 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
94 |
# Thu Jan 01 00:00:00 1970 +0000 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
95 |
# Node ID 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
96 |
# Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
97 |
divergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
98 |
|
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
99 |
diff --git a/bdivergent2 b/bdivergent2 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
100 |
new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
101 |
--- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
102 |
+++ b/bdivergent2 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
103 |
@@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
104 |
+bdivergent |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
105 |
|
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
106 |
$ hg prune -s 8374d2ddc3a4 "desc('added b')" |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
107 |
1 changesets pruned |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
108 |
$ hg prune -s 593c57f2117e "desc('added b')" --hidden |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
109 |
1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
110 |
2 new content-divergent changesets |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
111 |
|
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
112 |
$ hg log -G --patch |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
113 |
@ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
114 |
| diff --git a/bdivergent2 b/bdivergent2 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
115 |
| new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
116 |
| --- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
117 |
| +++ b/bdivergent2 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
118 |
| @@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
119 |
| +bdivergent |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
120 |
| |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
121 |
| * 2:593c57f2117e@default(draft) divergent [content-divergent] |
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
122 |
|/ diff --git a/bdivergent1 b/bdivergent1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
123 |
| new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
124 |
| --- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
125 |
| +++ b/bdivergent1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
126 |
| @@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
127 |
| +bdivergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
128 |
| |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
129 |
o 0:9092f1db7931@default(draft) added a [] |
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
130 |
diff --git a/a b/a |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
131 |
new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
132 |
--- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
133 |
+++ b/a |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
134 |
@@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
135 |
+a |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
136 |
|
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
137 |
|
3154
406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
138 |
$ hg evolve --all --any --content-divergent |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
139 |
merge:[2] divergent |
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
140 |
with: [3] divergent |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
141 |
base: [1] added b |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
142 |
updating to "local" side of the conflict: 593c57f2117e |
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
143 |
merging "other" content-divergent changeset '8374d2ddc3a4' |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
144 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3799
diff
changeset
|
145 |
working directory is now at 45bf1312f454 |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
146 |
$ hg log -G |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3799
diff
changeset
|
147 |
@ 4:45bf1312f454@default(draft) divergent [] |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
148 |
| |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
149 |
o 0:9092f1db7931@default(draft) added a [] |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
150 |
|
4492
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
151 |
$ hg export |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
152 |
# HG changeset patch |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
153 |
# User test |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
154 |
# Date 0 0 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
155 |
# Thu Jan 01 00:00:00 1970 +0000 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
156 |
# Node ID 45bf1312f45468b76158b33f8426e6530c8b35b1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
157 |
# Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
158 |
divergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
159 |
|
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
160 |
diff --git a/bdivergent1 b/bdivergent1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
161 |
new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
162 |
--- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
163 |
+++ b/bdivergent1 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
164 |
@@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
165 |
+bdivergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
166 |
diff --git a/bdivergent2 b/bdivergent2 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
167 |
new file mode 100644 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
168 |
--- /dev/null |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
169 |
+++ b/bdivergent2 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
170 |
@@ -0,0 +1,1 @@ |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
171 |
+bdivergent |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
172 |
|
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
173 |
$ cd .. |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
174 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
175 |
Extra setup |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
176 |
----------- |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
177 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
178 |
(the test below were initially in a different file) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
179 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
180 |
$ hg init cdiv |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
181 |
$ cd cdiv |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
182 |
$ echo ".*\.orig" > .hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
183 |
$ hg add .hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
184 |
$ hg ci -m "added hgignore" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
185 |
$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
186 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
187 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
188 |
@ 4:c41c793e0ef1 added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
189 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
190 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
191 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
192 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
193 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
194 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
195 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
196 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
197 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
198 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
199 |
Merging branch difference |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
200 |
------------------------- |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
201 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
202 |
Creating content-divergence with branch change where base, divergent and other |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
203 |
have different branches |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
204 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
205 |
$ hg branch -r . foobar |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
206 |
changed branch on 1 changesets |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
207 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
208 |
$ hg up c41c793e0ef1 --hidden |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
209 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
210 |
updated to hidden changeset c41c793e0ef1 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
211 |
(hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
212 |
working directory parent is obsolete! (c41c793e0ef1) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
213 |
(use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
214 |
$ echo bar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
215 |
$ hg branch watwat |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
216 |
marked working directory as branch watwat |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
217 |
$ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
218 |
2 new content-divergent changesets |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
219 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
220 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
221 |
@ 6:264b04f771fb added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
222 |
| () [watwat] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
223 |
| * 5:9e5dffcb3d48 added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
224 |
|/ () [foobar] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
225 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
226 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
227 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
228 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
229 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
230 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
231 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
232 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
233 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
234 |
$ hg evolve --content-divergent --config ui.interactive=True<<EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
235 |
> c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
236 |
> EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
237 |
merge:[6] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
238 |
with: [5] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
239 |
base: [4] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
240 |
merging "other" content-divergent changeset '9e5dffcb3d48' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
241 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
242 |
content divergent changesets on different branches. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
243 |
choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
244 |
working directory is now at 0ac42f1bc15c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
245 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
246 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
247 |
@ 7:0ac42f1bc15c added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
248 |
| () [foobar] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
249 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
250 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
251 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
252 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
253 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
254 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
255 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
256 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
257 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
258 |
Testing merging of commit messages |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
259 |
----------------------------------- |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
260 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
261 |
When base and one of the divergent has same commit messages and other divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
262 |
has different one |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
263 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
264 |
$ echo wat > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
265 |
$ hg amend |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
266 |
|
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
267 |
$ hg up .^ |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
268 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
269 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
270 |
$ echo bar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
271 |
$ hg ci -Aqm "added a d with bar in it, expect some beers" |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
272 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
273 |
$ hg prune -r 0ac42f1bc15c -s . --hidden |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
274 |
1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
275 |
2 new content-divergent changesets |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
276 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
277 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
278 |
@ 9:59081c9c425a added a d with bar in it, expect some beers |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
279 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
280 |
| * 8:f621d00f5f0e added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
281 |
|/ () [foobar] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
282 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
283 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
284 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
285 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
286 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
287 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
288 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
289 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
290 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
291 |
$ hg evolve --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
292 |
merge:[9] added a d with bar in it, expect some beers |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
293 |
with: [8] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
294 |
base: [7] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
295 |
merging "other" content-divergent changeset 'f621d00f5f0e' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
296 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
297 |
working directory is now at a9d6fd6b5e40 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
298 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
299 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
300 |
@ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
301 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
302 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
303 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
304 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
305 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
306 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
307 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
308 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
309 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
310 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
311 |
When base has different message and both divergents has same one |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
312 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
313 |
$ echo foo > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
314 |
$ hg amend -m "foo to d" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
315 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
316 |
$ hg up a9d6fd6b5e40 --hidden |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
317 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
318 |
updated to hidden changeset a9d6fd6b5e40 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
319 |
(hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
320 |
working directory parent is obsolete! (a9d6fd6b5e40) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
321 |
(use 'hg evolve' to update to its successor: b10b07a394f1) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
322 |
$ echo babar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
323 |
$ hg amend -m "foo to d" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
324 |
2 new content-divergent changesets |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
325 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
326 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
327 |
@ 12:0bb497fed24a foo to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
328 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
329 |
| * 11:b10b07a394f1 foo to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
330 |
|/ () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
331 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
332 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
333 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
334 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
335 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
336 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
337 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
338 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
339 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
340 |
$ hg evolve --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
341 |
merge:[12] foo to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
342 |
with: [11] foo to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
343 |
base: [10] added a d with bar in it, expect some beers |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
344 |
merging "other" content-divergent changeset 'b10b07a394f1' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
345 |
merging d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
346 |
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
347 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
348 |
fix conflicts and see `hg help evolve.interrupted` |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
349 |
[1] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
350 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
351 |
$ echo foobar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
352 |
$ hg resolve -m |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
353 |
(no more unresolved files) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
354 |
continue: hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
355 |
$ hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
356 |
working directory is now at 11175423b5dc |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
357 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
358 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
359 |
@ 13:11175423b5dc foo to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
360 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
361 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
362 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
363 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
364 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
365 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
366 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
367 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
368 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
369 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
370 |
When all three base, divergent and other has different commit messages creating |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
371 |
conflicts |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
372 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
373 |
$ echo bar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
374 |
$ hg amend -m "bar to d, expect beers" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
375 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
376 |
$ hg up 11175423b5dc --hidden |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
377 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
378 |
updated to hidden changeset 11175423b5dc |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
379 |
(hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
380 |
working directory parent is obsolete! (11175423b5dc) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
381 |
(use 'hg evolve' to update to its successor: 27f0463f169a) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
382 |
$ echo wat > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
383 |
$ hg amend -m "wat to d, wat?" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
384 |
2 new content-divergent changesets |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
385 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
386 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
387 |
@ 15:f542037ddf31 wat to d, wat? |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
388 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
389 |
| * 14:27f0463f169a bar to d, expect beers |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
390 |
|/ () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
391 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
392 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
393 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
394 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
395 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
396 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
397 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
398 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
399 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
400 |
$ hg evolve --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
401 |
merge:[15] wat to d, wat? |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
402 |
with: [14] bar to d, expect beers |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
403 |
base: [13] foo to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
404 |
merging "other" content-divergent changeset '27f0463f169a' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
405 |
merging d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
406 |
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
407 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
408 |
fix conflicts and see `hg help evolve.interrupted` |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
409 |
[1] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
410 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
411 |
$ echo watbar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
412 |
$ hg resolve -m |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
413 |
(no more unresolved files) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
414 |
continue: hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
415 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
416 |
$ cat > editor.sh <<EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
417 |
> #!/bin/sh |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
418 |
> printf "**showing editors text**\n\n" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
419 |
> cat \$1 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
420 |
> printf "\n**done showing editors text**\n\n" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
421 |
> cat > \$1 <<ENDOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
422 |
> watbar to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
423 |
> ENDOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
424 |
> EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
425 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
426 |
$ HGEDITOR='sh ./editor.sh' hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
427 |
**showing editors text** |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
428 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
429 |
HG: Conflicts while merging changeset description of content-divergent changesets. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
430 |
HG: Resolve conflicts in commit messages to continue. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
431 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
432 |
<<<<<<< divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
433 |
wat to d, wat?||||||| base |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
434 |
foo to d======= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
435 |
bar to d, expect beers>>>>>>> other |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
436 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
437 |
**done showing editors text** |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
438 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
439 |
working directory is now at 89ea3eee2d69 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
440 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
441 |
$ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
442 |
@ 16:89ea3eee2d69 watbar to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
443 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
444 |
o 3:ca1b80f7960a added c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
445 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
446 |
o 2:b1661037fa25 added b |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
447 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
448 |
o 1:c7586e2a9264 added a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
449 |
| () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
450 |
o 0:8fa14d15e168 added hgignore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
451 |
() [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
452 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
453 |
$ cd .. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
454 |
|
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
455 |
Stabilize content-divergent changesets with same parent |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
456 |
======================================================= |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
457 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
458 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
459 |
$ glog() { |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
460 |
> hg log -G --template \ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
461 |
> '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
462 |
> } |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
463 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
464 |
$ hg init content-divergent-savanna |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
465 |
$ cd content-divergent-savanna |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
466 |
$ echo a > a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
467 |
$ hg add a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
468 |
$ hg ci -m 'root' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
469 |
$ hg phase --public . |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
470 |
$ cat << EOF >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
471 |
> flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
472 |
> arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
473 |
> zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
474 |
> some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
475 |
> less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
476 |
> conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
477 |
> EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
478 |
$ hg ci -m 'More addition' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
479 |
$ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
480 |
@ 1:867e43582046@default(draft) bk:[] More addition |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
481 |
| |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
482 |
o 0:6569b5a81c7e@default(public) bk:[] root |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
483 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
484 |
$ echo 'babar' >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
485 |
$ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
486 |
$ hg up --hidden 'min(desc("More addition"))' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
487 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
488 |
updated to hidden changeset 867e43582046 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
489 |
(hidden revision '867e43582046' was rewritten as: fc6349f931da) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
490 |
working directory parent is obsolete! (867e43582046) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
491 |
(use 'hg evolve' to update to its successor: fc6349f931da) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
492 |
$ mv a a.old |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
493 |
$ echo 'jungle' > a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
494 |
$ cat a.old >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
495 |
$ rm a.old |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
496 |
$ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
497 |
2 new content-divergent changesets |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
498 |
$ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
499 |
@ 3:051337a45e7c@default(draft) bk:[] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
500 |
| |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
501 |
| * 2:fc6349f931da@default(draft) bk:[] More addition |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
502 |
|/ |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
503 |
o 0:6569b5a81c7e@default(public) bk:[] root |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
504 |
|
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
505 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
506 |
Stabilize it |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
507 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
508 |
$ hg evolve -qn --confirm --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
509 |
merge:[3] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
510 |
with: [2] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
511 |
base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
512 |
perform evolve? [Ny] n |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
513 |
abort: evolve aborted by user |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
514 |
[255] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
515 |
$ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
516 |
merge:[3] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
517 |
with: [2] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
518 |
base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
519 |
perform evolve? [Ny] y |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
520 |
hg update -c 051337a45e7c && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
521 |
hg merge fc6349f931da && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
522 |
hg commit -m "auto merge resolving conflict between 051337a45e7c and fc6349f931da"&& |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
523 |
hg up -C 867e43582046 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
524 |
hg revert --all --rev tip && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
525 |
hg commit -m "`hg log -r 051337a45e7c --template={desc}`"; |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
526 |
$ hg evolve -v --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
527 |
merge:[3] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
528 |
with: [2] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
529 |
base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
530 |
merging "other" content-divergent changeset 'fc6349f931da' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
531 |
resolving manifests |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
532 |
merging a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
533 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
534 |
committing files: |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
535 |
a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
536 |
committing manifest |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
537 |
committing changelog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
538 |
working directory is now at 5bf84d1d71d1 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
539 |
$ hg st |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
540 |
$ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
541 |
@ 4:5bf84d1d71d1@default(draft) bk:[] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
542 |
| |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
543 |
o 0:6569b5a81c7e@default(public) bk:[] root |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
544 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
545 |
$ hg summary |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
546 |
parent: 4:5bf84d1d71d1 tip |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
547 |
More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
548 |
branch: default |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
549 |
commit: (clean) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
550 |
update: (current) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
551 |
phases: 1 draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
552 |
$ hg export . --config diff.unified=3 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
553 |
# HG changeset patch |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
554 |
# User test |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
555 |
# Date 0 0 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
556 |
# Thu Jan 01 00:00:00 1970 +0000 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
557 |
# Node ID 5bf84d1d71d12f451bfe1e09b93045eb6338cd6c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
558 |
# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
559 |
More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
560 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
561 |
diff --git a/a b/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
562 |
--- a/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
563 |
+++ b/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
564 |
@@ -1,1 +1,9 @@ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
565 |
+jungle |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
566 |
a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
567 |
+flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
568 |
+arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
569 |
+zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
570 |
+some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
571 |
+less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
572 |
+conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
573 |
+babar |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
574 |
|
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
575 |
Check conflict during content-divergence resolution |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
576 |
--------------------------------------------------- |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
577 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
578 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
579 |
$ hg up --hidden 'min(desc("More addition"))' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
580 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
581 |
updated to hidden changeset 867e43582046 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
582 |
(hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
583 |
working directory parent is obsolete! (867e43582046) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
584 |
(use 'hg evolve' to update to its successor: 5bf84d1d71d1) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
585 |
$ echo 'gotta break' >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
586 |
$ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
587 |
2 new content-divergent changesets |
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
588 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
589 |
# reamend so that the case is not the first precursor. |
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
590 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
591 |
$ hg amend -m "More addition (2)" |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
592 |
$ hg phase 'contentdivergent()' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
593 |
4: draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
594 |
6: draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
595 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
596 |
$ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
597 |
@ 6:13c1b75640a1@default(draft) bk:[] More addition (2) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
598 |
| |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
599 |
| * 4:5bf84d1d71d1@default(draft) bk:[] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
600 |
|/ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
601 |
o 0:6569b5a81c7e@default(public) bk:[] root |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
602 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
603 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
604 |
$ hg evolve -qn --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
605 |
hg update -c 13c1b75640a1 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
606 |
hg merge 5bf84d1d71d1 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
607 |
hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&& |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
608 |
hg up -C 867e43582046 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
609 |
hg revert --all --rev tip && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
610 |
hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
611 |
$ hg evolve --content-divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
612 |
merge:[6] More addition (2) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
613 |
with: [4] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
614 |
base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
615 |
merging "other" content-divergent changeset '5bf84d1d71d1' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
616 |
merging a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
617 |
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
618 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
619 |
fix conflicts and see `hg help evolve.interrupted` |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
620 |
[1] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
621 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
622 |
$ cat > a <<EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
623 |
> jungle |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
624 |
> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
625 |
> flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
626 |
> arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
627 |
> zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
628 |
> some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
629 |
> less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
630 |
> conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
631 |
> babar |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
632 |
> EOF |
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
633 |
|
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
634 |
$ hg resolve -m |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
635 |
(no more unresolved files) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
636 |
continue: hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
637 |
$ hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
638 |
working directory is now at 2346e1147fed |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
639 |
$ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
640 |
@ 7:2346e1147fed@default(draft) bk:[] More addition (2) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
641 |
| |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
642 |
o 0:6569b5a81c7e@default(public) bk:[] root |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
643 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
644 |
$ hg exp --config diff.unified=3 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
645 |
# HG changeset patch |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
646 |
# User test |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
647 |
# Date 0 0 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
648 |
# Thu Jan 01 00:00:00 1970 +0000 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
649 |
# Node ID 2346e1147fedc8c9aa17f9ba7870dcd8be52f567 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
650 |
# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
651 |
More addition (2) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
652 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
653 |
diff --git a/a b/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
654 |
--- a/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
655 |
+++ b/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
656 |
@@ -1,1 +1,9 @@ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
657 |
+jungle |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
658 |
a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
659 |
+flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
660 |
+arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
661 |
+zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
662 |
+some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
663 |
+less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
664 |
+conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
665 |
+babar |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
666 |
$ cd .. |
4493
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
667 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
668 |
Check case where one side undo some of the common predecessors change |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
669 |
--------------------------------------------------------------------- |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
670 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
671 |
The goal is to make sure we merge using the right base. |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
672 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
673 |
$ hg init predecessors-as-merge-base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
674 |
$ cd predecessors-as-merge-base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
675 |
$ cat << EOF > numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
676 |
> 1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
677 |
> 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
678 |
> 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
679 |
> 4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
680 |
> 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
681 |
> 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
682 |
> 7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
683 |
> 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
684 |
> 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
685 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
686 |
$ cat << EOF > letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
687 |
> a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
688 |
> b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
689 |
> c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
690 |
> d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
691 |
> e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
692 |
> f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
693 |
> g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
694 |
> h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
695 |
> i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
696 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
697 |
$ cat << EOF > romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
698 |
> I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
699 |
> II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
700 |
> III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
701 |
> IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
702 |
> V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
703 |
> VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
704 |
> VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
705 |
> VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
706 |
> IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
707 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
708 |
$ hg add numbers letters romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
709 |
$ hg commit -m root |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
710 |
$ cat << EOF > numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
711 |
> 1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
712 |
> 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
713 |
> 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
714 |
> four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
715 |
> 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
716 |
> 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
717 |
> 7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
718 |
> 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
719 |
> 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
720 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
721 |
$ cat << EOF > letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
722 |
> a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
723 |
> b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
724 |
> c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
725 |
> D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
726 |
> e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
727 |
> f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
728 |
> g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
729 |
> h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
730 |
> i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
731 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
732 |
$ hg commit -m E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
733 |
$ cat << EOF > numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
734 |
> 1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
735 |
> 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
736 |
> 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
737 |
> 4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
738 |
> 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
739 |
> 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
740 |
> seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
741 |
> 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
742 |
> 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
743 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
744 |
$ cat << EOF > romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
745 |
> I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
746 |
> II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
747 |
> III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
748 |
> IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
749 |
> V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
750 |
> vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
751 |
> VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
752 |
> VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
753 |
> IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
754 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
755 |
$ hg commit --amend -m E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
756 |
$ hg --hidden update -r 'desc(E1)' |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
757 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
758 |
updated to hidden changeset 4a250e5bd992 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
759 |
(hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
760 |
working directory parent is obsolete! (4a250e5bd992) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
761 |
(use 'hg evolve' to update to its successor: 084ae625fa51) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
762 |
$ cat << EOF > numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
763 |
> one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
764 |
> 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
765 |
> 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
766 |
> four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
767 |
> 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
768 |
> 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
769 |
> 7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
770 |
> 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
771 |
> 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
772 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
773 |
$ cat << EOF > letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
774 |
> a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
775 |
> b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
776 |
> c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
777 |
> d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
778 |
> e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
779 |
> f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
780 |
> g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
781 |
> h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
782 |
> i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
783 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
784 |
$ cat << EOF > romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
785 |
> I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
786 |
> ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
787 |
> III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
788 |
> IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
789 |
> V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
790 |
> VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
791 |
> VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
792 |
> VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
793 |
> IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
794 |
> EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
795 |
$ hg commit --amend -m E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
796 |
2 new content-divergent changesets |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
797 |
$ hg log -G --patch --hidden |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
798 |
@ 3:19ed1bf64a2c@default(draft) E3 [content-divergent] |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
799 |
| diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
800 |
| --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
801 |
| +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
802 |
| @@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
803 |
| -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
804 |
| +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
805 |
| @@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
806 |
| -4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
807 |
| +four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
808 |
| diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
809 |
| --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
810 |
| +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
811 |
| @@ -2,1 +2,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
812 |
| -II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
813 |
| +ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
814 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
815 |
| * 2:084ae625fa51@default(draft) E2 [content-divergent] |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
816 |
|/ diff --git a/letters b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
817 |
| --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
818 |
| +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
819 |
| @@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
820 |
| -d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
821 |
| +D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
822 |
| diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
823 |
| --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
824 |
| +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
825 |
| @@ -7,1 +7,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
826 |
| -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
827 |
| +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
828 |
| diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
829 |
| --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
830 |
| +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
831 |
| @@ -6,1 +6,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
832 |
| -VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
833 |
| +vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
834 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
835 |
| x 1:4a250e5bd992@default(draft) E1 [] |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
836 |
|/ diff --git a/letters b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
837 |
| --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
838 |
| +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
839 |
| @@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
840 |
| -d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
841 |
| +D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
842 |
| diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
843 |
| --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
844 |
| +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
845 |
| @@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
846 |
| -4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
847 |
| +four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
848 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
849 |
o 0:6d1fdf6de7e2@default(draft) root [] |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
850 |
diff --git a/letters b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
851 |
new file mode 100644 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
852 |
--- /dev/null |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
853 |
+++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
854 |
@@ -0,0 +1,9 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
855 |
+a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
856 |
+b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
857 |
+c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
858 |
+d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
859 |
+e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
860 |
+f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
861 |
+g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
862 |
+h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
863 |
+i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
864 |
diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
865 |
new file mode 100644 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
866 |
--- /dev/null |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
867 |
+++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
868 |
@@ -0,0 +1,9 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
869 |
+1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
870 |
+2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
871 |
+3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
872 |
+4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
873 |
+5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
874 |
+6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
875 |
+7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
876 |
+8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
877 |
+9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
878 |
diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
879 |
new file mode 100644 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
880 |
--- /dev/null |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
881 |
+++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
882 |
@@ -0,0 +1,9 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
883 |
+I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
884 |
+II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
885 |
+III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
886 |
+IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
887 |
+V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
888 |
+VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
889 |
+VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
890 |
+VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
891 |
+IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
892 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
893 |
$ hg evolve --list |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
894 |
084ae625fa51: E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
895 |
content-divergent: 19ed1bf64a2c (draft) (precursor 4a250e5bd992) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
896 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
897 |
19ed1bf64a2c: E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
898 |
content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
899 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
900 |
$ hg obslog --all --patch |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
901 |
* 084ae625fa51 (2) E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
902 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
903 |
| @ 19ed1bf64a2c (3) E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
904 |
|/ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
905 |
x 4a250e5bd992 (1) E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
906 |
rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
907 |
diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
908 |
--- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
909 |
+++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
910 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
911 |
-E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
912 |
+E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
913 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
914 |
diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
915 |
--- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
916 |
+++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
917 |
@@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
918 |
-four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
919 |
+4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
920 |
@@ -7,1 +7,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
921 |
-7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
922 |
+seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
923 |
diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
924 |
--- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
925 |
+++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
926 |
@@ -6,1 +6,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
927 |
-VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
928 |
+vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
929 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
930 |
rewritten(description, content) as 19ed1bf64a2c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
931 |
diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
932 |
--- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
933 |
+++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
934 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
935 |
-E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
936 |
+E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
937 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
938 |
diff --git a/letters b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
939 |
--- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
940 |
+++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
941 |
@@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
942 |
-D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
943 |
+d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
944 |
diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
945 |
--- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
946 |
+++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
947 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
948 |
-1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
949 |
+one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
950 |
diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
951 |
--- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
952 |
+++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
953 |
@@ -2,1 +2,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
954 |
-II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
955 |
+ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
956 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
957 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
958 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
959 |
$ hg evolve --content-divergent --rev 'desc("E3")' |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
960 |
merge:[2] E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
961 |
with: [3] E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
962 |
base: [1] E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
963 |
updating to "local" side of the conflict: 084ae625fa51 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
964 |
merging "other" content-divergent changeset '19ed1bf64a2c' |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
965 |
merging numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
966 |
merging romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
967 |
1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
968 |
working directory is now at aae293050980 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
969 |
$ hg status |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
970 |
$ hg amend -m 'E4' |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
971 |
$ hg export |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
972 |
# HG changeset patch |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
973 |
# User test |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
974 |
# Date 0 0 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
975 |
# Thu Jan 01 00:00:00 1970 +0000 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
976 |
# Node ID 8c2a6aae4bc5c1cc00c68276017dcef3d468e895 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
977 |
# Parent 6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
978 |
E4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
979 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
980 |
diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
981 |
--- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
982 |
+++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
983 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
984 |
-1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
985 |
+one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
986 |
@@ -7,1 +7,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
987 |
-7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
988 |
+seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
989 |
diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
990 |
--- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
991 |
+++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
992 |
@@ -2,1 +2,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
993 |
-II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
994 |
+ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
995 |
@@ -6,1 +6,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
996 |
-VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
997 |
+vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
998 |
$ hg log -G |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
999 |
@ 5:8c2a6aae4bc5@default(draft) E4 [] |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1000 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1001 |
o 0:6d1fdf6de7e2@default(draft) root [] |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1002 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1003 |
$ hg obslog --patch |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1004 |
@ 8c2a6aae4bc5 (5) E4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1005 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1006 |
x aae293050980 (4) <<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1007 |
|\ rewritten(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1008 |
| | diff -r aae293050980 -r 8c2a6aae4bc5 changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1009 |
| | --- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1010 |
| | +++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1011 |
| | @@ -1,4 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1012 |
| | -<<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1013 |
| | -E2||||||| base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1014 |
| | -E1======= |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1015 |
| | -E3>>>>>>> other |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1016 |
| | +E4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1017 |
| | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1018 |
| | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1019 |
x | 084ae625fa51 (2) E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1020 |
| | rewritten(description, content) as aae293050980 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1021 |
| | diff -r 084ae625fa51 -r aae293050980 changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1022 |
| | --- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1023 |
| | +++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1024 |
| | @@ -1,1 +1,4 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1025 |
| | -E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1026 |
| | +<<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1027 |
| | +E2||||||| base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1028 |
| | +E1======= |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1029 |
| | +E3>>>>>>> other |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1030 |
| | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1031 |
| | diff --git a/letters b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1032 |
| | --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1033 |
| | +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1034 |
| | @@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1035 |
| | -D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1036 |
| | +d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1037 |
| | diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1038 |
| | --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1039 |
| | +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1040 |
| | @@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1041 |
| | -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1042 |
| | +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1043 |
| | diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1044 |
| | --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1045 |
| | +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1046 |
| | @@ -2,1 +2,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1047 |
| | -II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1048 |
| | +ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1049 |
| | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1050 |
| | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1051 |
| x 19ed1bf64a2c (3) E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1052 |
|/ rewritten(description, content) as aae293050980 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1053 |
| diff -r 19ed1bf64a2c -r aae293050980 changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1054 |
| --- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1055 |
| +++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1056 |
| @@ -1,1 +1,4 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1057 |
| -E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1058 |
| +<<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1059 |
| +E2||||||| base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1060 |
| +E1======= |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1061 |
| +E3>>>>>>> other |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1062 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1063 |
| diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1064 |
| --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1065 |
| +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1066 |
| @@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1067 |
| -four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1068 |
| +4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1069 |
| @@ -7,1 +7,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1070 |
| -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1071 |
| +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1072 |
| diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1073 |
| --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1074 |
| +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1075 |
| @@ -6,1 +6,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1076 |
| -VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1077 |
| +vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1078 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1079 |
| |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1080 |
x 4a250e5bd992 (1) E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1081 |
rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1082 |
diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1083 |
--- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1084 |
+++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1085 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1086 |
-E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1087 |
+E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1088 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1089 |
diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1090 |
--- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1091 |
+++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1092 |
@@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1093 |
-four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1094 |
+4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1095 |
@@ -7,1 +7,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1096 |
-7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1097 |
+seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1098 |
diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1099 |
--- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1100 |
+++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1101 |
@@ -6,1 +6,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1102 |
-VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1103 |
+vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1104 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1105 |
rewritten(description, content) as 19ed1bf64a2c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1106 |
diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1107 |
--- a/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1108 |
+++ b/changeset-description |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1109 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1110 |
-E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1111 |
+E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1112 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1113 |
diff --git a/letters b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1114 |
--- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1115 |
+++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1116 |
@@ -4,1 +4,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1117 |
-D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1118 |
+d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1119 |
diff --git a/numbers b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1120 |
--- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1121 |
+++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1122 |
@@ -1,1 +1,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1123 |
-1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1124 |
+one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1125 |
diff --git a/romans b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1126 |
--- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1127 |
+++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1128 |
@@ -2,1 +2,1 @@ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1129 |
-II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1130 |
+ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1131 |
|
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1132 |