Mercurial > evolve
annotate tests/test-evolve-content-divergent-basic.t @ 5277:304de9a04172
tests: avoid referring to commits by hash in a few places
This patch means that the next patch can be written without manual
editing of the test cases.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 01 May 2020 07:44:01 -0700 |
parents | 417503ef667d |
children | 13376ca93fa3 |
rev | line source |
---|---|
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] |
4625
a4fde4e3e763
templatekw: add `instabilities` alias for `troubles`
Matt Harbison <matt_harbison@yahoo.com>
parents:
4578
diff
changeset
|
23 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{instabilities}]\n |
5079
1f92a6aa40d6
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4676
diff
changeset
|
24 > [experimental] |
1f92a6aa40d6
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4676
diff
changeset
|
25 > evolution.allowdivergence = True |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
26 > [extensions] |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
27 > EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1630
diff
changeset
|
28 $ 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
|
29 $ mkcommit() { |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
30 > echo "$1" > "$1" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
31 > hg add "$1" |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
32 > 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
|
33 > } |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
34 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
35 $ mkcommits() { |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
36 > 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
|
37 > } |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
38 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
39 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
|
40 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
|
41 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
42 $ hg init test1 |
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
43 $ cd test1 |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
44 $ echo a > a |
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 a" |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
46 $ echo b > b |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
47 $ 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
|
48 $ 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
|
49 # 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
|
50 # 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
|
51 # 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
|
52 # 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
|
53 # 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
|
54 # 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
|
55 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
|
56 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
57 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
|
58 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
|
59 --- /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
|
60 +++ 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
|
61 @@ -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
|
62 +b |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
63 |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
64 $ hg up .^ |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
65 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
|
66 $ 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
|
67 $ 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
|
68 adding bdivergent1 |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
69 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
|
70 $ 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
|
71 # 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
|
72 # 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
|
73 # 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
|
74 # 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
|
75 # 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
|
76 # 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
|
77 divergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
78 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
79 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
|
80 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
|
81 --- /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
|
82 +++ 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
|
83 @@ -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
|
84 +bdivergent |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
85 |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
86 $ hg up .^ |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
87 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
|
88 $ 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
|
89 $ 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
|
90 adding bdivergent2 |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
91 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
|
92 $ 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
|
93 # 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
|
94 # 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
|
95 # 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
|
96 # 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
|
97 # 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
|
98 # 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
|
99 divergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
100 |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
101 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
|
102 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
|
103 --- /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
|
104 +++ 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
|
105 @@ -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
|
106 +bdivergent |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
107 |
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 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
|
109 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
|
110 $ 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
|
111 1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
112 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
|
113 |
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 $ 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
|
115 @ 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
|
116 | 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
|
117 | 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
|
118 | --- /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
|
119 | +++ 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
|
120 | @@ -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
|
121 | +bdivergent |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
122 | |
3799
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
123 | * 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
|
124 |/ 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
|
125 | 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
|
126 | --- /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
|
127 | +++ 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
|
128 | @@ -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
|
129 | +bdivergent |
91e0d05e06c6
test: clarify changeset concent in the first content-divergence test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4490
diff
changeset
|
130 | |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 --- /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
|
135 +++ 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
|
136 @@ -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
|
137 +a |
1467
5c385b812500
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
diff
changeset
|
138 |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
139 |
3154
406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
140 $ 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
|
141 merge:[2] divergent |
037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3798
diff
changeset
|
142 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
|
143 base: [1] added b |
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 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
234 $ hg evolve --content-divergent --no-all --config ui.interactive=True << EOF |
4481
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 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
|
241 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
|
242 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
|
243 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
|
244 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
245 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
246 @ 7:0ac42f1bc15c added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
247 | () [foobar] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
248 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
|
249 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
250 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
|
251 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
252 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
|
253 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
254 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
|
255 () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
256 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
257 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
|
258 ----------------------------------- |
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 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
|
261 has different one |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
262 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
263 $ echo wat > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
264 $ hg amend |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
265 |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
266 $ hg up .^ |
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
267 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
|
268 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
269 $ echo bar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
270 $ 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
|
271 |
5277
304de9a04172
tests: avoid referring to commits by hash in a few places
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
272 $ hg prune -r 'predecessors(desc("added d") - obsolete())' -s . --hidden |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
273 1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
274 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
|
275 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
276 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
277 @ 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
|
278 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
279 | * 8:f621d00f5f0e added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
280 |/ () [foobar] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
281 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
|
282 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
283 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
|
284 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
285 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
|
286 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
287 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
|
288 () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
289 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
290 $ hg evolve --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
291 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
|
292 with: [8] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
293 base: [7] added d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
294 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
|
295 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
|
296 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
297 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
298 @ 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
|
299 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
300 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
|
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 2:b1661037fa25 added b |
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 1:c7586e2a9264 added a |
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 0:8fa14d15e168 added hgignore |
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 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
309 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
|
310 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
311 $ echo foo > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
312 $ 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
|
313 |
5277
304de9a04172
tests: avoid referring to commits by hash in a few places
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
314 $ hg up 'predecessors(.)' --hidden |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
315 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
|
316 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
|
317 (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
|
318 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
|
319 (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
|
320 $ echo babar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
321 $ 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
|
322 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
|
323 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
324 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
325 @ 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
|
326 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
327 | * 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
|
328 |/ () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
329 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
|
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 2:b1661037fa25 added b |
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 1:c7586e2a9264 added a |
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 0:8fa14d15e168 added hgignore |
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 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
338 $ hg evolve --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
339 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
|
340 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
|
341 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
|
342 merging d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
343 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
|
344 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
345 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
346 (see 'hg help evolve.interrupted') |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
347 [1] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
348 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
349 $ echo foobar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
350 $ hg resolve -m |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
351 (no more unresolved files) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
352 continue: hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
353 $ hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
354 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
|
355 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
356 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
357 @ 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
|
358 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
359 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
|
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 2:b1661037fa25 added b |
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 1:c7586e2a9264 added a |
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 0:8fa14d15e168 added hgignore |
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 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
368 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
|
369 conflicts |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
370 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
371 $ echo bar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
372 $ 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
|
373 |
5277
304de9a04172
tests: avoid referring to commits by hash in a few places
Martin von Zweigbergk <martinvonz@google.com>
parents:
5275
diff
changeset
|
374 $ hg up 'predecessors(.)' --hidden |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
375 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
|
376 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
|
377 (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
|
378 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
|
379 (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
|
380 $ echo wat > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
381 $ 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
|
382 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
|
383 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
384 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
385 @ 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
|
386 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
387 | * 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
|
388 |/ () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
389 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
|
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 2:b1661037fa25 added b |
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 1:c7586e2a9264 added a |
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 0:8fa14d15e168 added hgignore |
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 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
398 $ hg evolve --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
399 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
|
400 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
|
401 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
|
402 merging d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
403 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
|
404 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
405 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
406 (see 'hg help evolve.interrupted') |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
407 [1] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
408 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
409 $ echo watbar > d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
410 $ hg resolve -m |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
411 (no more unresolved files) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
412 continue: hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
413 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
414 $ cat > editor.sh <<EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
415 > #!/bin/sh |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
416 > 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
|
417 > cat \$1 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
418 > 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
|
419 > cat > \$1 <<ENDOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
420 > watbar to d |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
421 > ENDOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
422 > EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
423 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
424 $ 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
|
425 **showing editors text** |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
426 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
427 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
|
428 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
|
429 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
430 <<<<<<< divergent |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
431 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
|
432 foo to d======= |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
433 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
|
434 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
435 **done showing editors text** |
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 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
|
438 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
439 $ hg glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
440 @ 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
|
441 | () [default] draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
442 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
|
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 2:b1661037fa25 added b |
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 1:c7586e2a9264 added a |
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 0:8fa14d15e168 added hgignore |
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 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
451 $ cd .. |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
452 |
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
453 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
|
454 ======================================================= |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
455 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
456 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
457 $ glog() { |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
458 > hg log -G --template \ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
459 > '{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
|
460 > } |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
461 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
462 $ 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
|
463 $ cd content-divergent-savanna |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
464 $ echo a > a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
465 $ hg add a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
466 $ hg ci -m 'root' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
467 $ hg phase --public . |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
468 $ cat << EOF >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
469 > flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
470 > arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
471 > zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
472 > some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
473 > less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
474 > conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
475 > EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
476 $ 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
|
477 $ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
478 @ 1:867e43582046@default(draft) bk:[] More addition |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
479 | |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
480 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
|
481 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
482 $ echo 'babar' >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
483 $ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
484 $ 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
|
485 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
|
486 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
|
487 (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
|
488 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
|
489 (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
|
490 $ mv a a.old |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
491 $ echo 'jungle' > a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
492 $ cat a.old >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
493 $ rm a.old |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
494 $ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
495 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
|
496 $ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
497 @ 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
|
498 | |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
499 | * 2:fc6349f931da@default(draft) bk:[] More addition |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
500 |/ |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
501 o 0:6569b5a81c7e@default(public) bk:[] root |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
502 |
3798
7c05ee4a8cc7
tests: don't use mkcommit shell function in test-divergent.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3787
diff
changeset
|
503 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
504 Stabilize it |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
505 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
506 $ hg evolve -qn --confirm --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
507 merge:[3] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
508 with: [2] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
509 base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
510 perform evolve? [Ny] n |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
511 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
|
512 [255] |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
513 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
514 merge:[3] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
515 with: [2] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
516 base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
517 perform evolve? [Ny] y |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
518 hg update -c 051337a45e7c && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
519 hg merge fc6349f931da && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
520 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
|
521 hg up -C 867e43582046 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
522 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
|
523 hg commit -m "`hg log -r 051337a45e7c --template={desc}`"; |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
524 $ hg evolve -v --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
525 merge:[3] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
526 with: [2] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
527 base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
528 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
|
529 resolving manifests |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
530 merging a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
531 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
|
532 committing files: |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
533 a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
534 committing manifest |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
535 committing changelog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
536 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
|
537 $ hg st |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
538 $ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
539 @ 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
|
540 | |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
541 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
|
542 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
543 $ hg summary |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
544 parent: 4:5bf84d1d71d1 tip |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
545 More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
546 branch: default |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
547 commit: (clean) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
548 update: (current) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
549 phases: 1 draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
550 $ 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
|
551 # HG changeset patch |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
552 # User test |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
553 # Date 0 0 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
554 # 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
|
555 # Node ID 5bf84d1d71d12f451bfe1e09b93045eb6338cd6c |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
556 # Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
557 More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
558 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
559 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
|
560 --- a/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
561 +++ b/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
562 @@ -1,1 +1,9 @@ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
563 +jungle |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
564 a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
565 +flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
566 +arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
567 +zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
568 +some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
569 +less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
570 +conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
571 +babar |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
572 |
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
573 Check conflict during content-divergence resolution |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
574 --------------------------------------------------- |
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
575 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
576 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
577 $ 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
|
578 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
|
579 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
|
580 (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
|
581 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
|
582 (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
|
583 $ echo 'gotta break' >> a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
584 $ hg amend |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
585 2 new content-divergent changesets |
4490
7a5c6109ee84
branching: merge with test consolidation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4481
diff
changeset
|
586 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
587 # 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
|
588 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
589 $ 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
|
590 $ hg phase 'contentdivergent()' |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
591 4: draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
592 6: draft |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
593 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
594 $ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
595 @ 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
|
596 | |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
597 | * 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
|
598 |/ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
599 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
|
600 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
601 |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
602 $ hg evolve -qn --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
603 hg update -c 13c1b75640a1 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
604 hg merge 5bf84d1d71d1 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
605 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
|
606 hg up -C 867e43582046 && |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
607 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
|
608 hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; |
4578
75e76141cba2
tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents:
4493
diff
changeset
|
609 $ hg evolve --content-divergent --no-all |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
610 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
|
611 with: [4] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
612 base: [1] More addition |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
613 merging a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
614 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
|
615 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
616 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4633
diff
changeset
|
617 (see 'hg help evolve.interrupted') |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
618 [1] |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
619 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
620 $ cat > a <<EOF |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
621 > jungle |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
622 > a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
623 > flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
624 > arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
625 > zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
626 > some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
627 > less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
628 > conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
629 > babar |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
630 > EOF |
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
631 |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
632 $ hg resolve -m |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
633 (no more unresolved files) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
634 continue: hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
635 $ hg evolve --continue |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
636 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
|
637 $ glog |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
638 @ 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
|
639 | |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
640 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
|
641 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
642 $ 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
|
643 # HG changeset patch |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
644 # User test |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
645 # Date 0 0 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
646 # 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
|
647 # Node ID 2346e1147fedc8c9aa17f9ba7870dcd8be52f567 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
648 # Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
649 More addition (2) |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
650 |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
651 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
|
652 --- a/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
653 +++ b/a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
654 @@ -1,1 +1,9 @@ |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
655 +jungle |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
656 a |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
657 +flore |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
658 +arthur |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
659 +zephir |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
660 +some |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
661 +less |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
662 +conflict |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3846
diff
changeset
|
663 +babar |
1630
35c666ef724e
evolve: Fix crush when reading docstring
Juntao Li <juntaoli@fb.com>
parents:
1536
diff
changeset
|
664 $ cd .. |
4493
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
665 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
666 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
|
667 --------------------------------------------------------------------- |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
668 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
669 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
|
670 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
671 $ 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
|
672 $ 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
|
673 $ 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
|
674 > 1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
675 > 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
676 > 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
677 > 4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
678 > 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
679 > 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
680 > 7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
681 > 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
682 > 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
683 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
684 $ 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
|
685 > a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
686 > b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
687 > c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
688 > d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
689 > e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
690 > f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
691 > g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
692 > h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
693 > i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
694 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
695 $ 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
|
696 > I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
697 > II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
698 > III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
699 > IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
700 > V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
701 > VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
702 > VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
703 > VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
704 > IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
705 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
706 $ 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
|
707 $ 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
|
708 $ 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
|
709 > 1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
710 > 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
711 > 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
712 > four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
713 > 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
714 > 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
715 > 7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
716 > 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
717 > 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
718 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
719 $ 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
|
720 > a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
721 > b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
722 > c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
723 > D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
724 > e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
725 > f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
726 > g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
727 > h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
728 > i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
729 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
730 $ 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
|
731 $ 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
|
732 > 1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
733 > 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
734 > 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
735 > 4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
736 > 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
737 > 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
738 > seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
739 > 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
740 > 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
741 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
742 $ 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
|
743 > I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
744 > II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
745 > III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
746 > IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
747 > V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
748 > vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
749 > VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
750 > VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
751 > IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
752 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
753 $ 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
|
754 $ 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
|
755 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
|
756 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
|
757 (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
|
758 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
|
759 (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
|
760 $ 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
|
761 > one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
762 > 2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
763 > 3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
764 > four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
765 > 5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
766 > 6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
767 > 7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
768 > 8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
769 > 9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
770 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
771 $ 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
|
772 > a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
773 > b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
774 > c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
775 > d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
776 > e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
777 > f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
778 > g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
779 > h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
780 > i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
781 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
782 $ 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
|
783 > I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
784 > ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
785 > III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
786 > IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
787 > V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
788 > VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
789 > VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
790 > VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
791 > IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
792 > EOF |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
793 $ 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
|
794 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
|
795 $ 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
|
796 @ 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
|
797 | 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
|
798 | --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
799 | +++ 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 | @@ -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
|
801 | -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
802 | +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
803 | @@ -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
|
804 | -4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
805 | +four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
806 | 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
|
807 | --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
808 | +++ 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 | @@ -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
|
810 | -II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
811 | +ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
812 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
813 | * 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
|
814 |/ 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
|
815 | --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
816 | +++ 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 | @@ -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
|
818 | -d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
819 | +D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
820 | 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
|
821 | --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
822 | +++ 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 | @@ -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
|
824 | -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
825 | +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
826 | 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
|
827 | --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
828 | +++ 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 | @@ -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
|
830 | -VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
831 | +vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
832 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
833 | 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
|
834 |/ 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
|
835 | --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
836 | +++ 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 | @@ -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
|
838 | -d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
839 | +D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
840 | 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
|
841 | --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
842 | +++ 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 | @@ -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
|
844 | -4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
845 | +four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
846 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
847 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
|
848 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
|
849 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
|
850 --- /dev/null |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
851 +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
852 @@ -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
|
853 +a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
854 +b |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
855 +c |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
856 +d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
857 +e |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
858 +f |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
859 +g |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
860 +h |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
861 +i |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
862 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
|
863 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
|
864 --- /dev/null |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
865 +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
866 @@ -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
|
867 +1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
868 +2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
869 +3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
870 +4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
871 +5 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
872 +6 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
873 +7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
874 +8 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
875 +9 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
876 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
|
877 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
|
878 --- /dev/null |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
879 +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
880 @@ -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
|
881 +I |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
882 +II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
883 +III |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
884 +IV |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
885 +V |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
886 +VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
887 +VII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
888 +VIII |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
889 +IX |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
890 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
891 $ 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
|
892 084ae625fa51: E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
893 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
|
894 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
895 19ed1bf64a2c: E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
896 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
|
897 |
5275
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
898 $ hg debugobsolete |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
899 4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
900 4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
4493
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
901 $ 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
|
902 * 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
|
903 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
904 | @ 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
|
905 |/ |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
906 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
|
907 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
|
908 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
|
909 --- 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
|
910 +++ 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
|
911 @@ -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
|
912 -E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
913 +E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
914 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
915 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
|
916 --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
917 +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
918 @@ -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
|
919 -four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
920 +4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
921 @@ -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
|
922 -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
923 +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
924 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
|
925 --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
926 +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
927 @@ -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
|
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 +vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
930 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
931 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
|
932 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
|
933 --- 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
|
934 +++ 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
|
935 @@ -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
|
936 -E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
937 +E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
938 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
939 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
|
940 --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
941 +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
942 @@ -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
|
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 +d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
945 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
|
946 --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
947 +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
948 @@ -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
|
949 -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
950 +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
951 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
|
952 --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
953 +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
954 @@ -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
|
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 +ii |
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 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
960 $ 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
|
961 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
|
962 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
|
963 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
|
964 merging numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
965 merging romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
966 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
|
967 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
|
968 $ hg status |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
969 $ 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
|
970 $ hg export |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
971 # 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
|
972 # User test |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
973 # 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
|
974 # 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
|
975 # 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
|
976 # Parent 6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
977 E4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
978 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
979 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
|
980 --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
981 +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
982 @@ -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
|
983 -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
984 +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
985 @@ -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
|
986 -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
987 +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
988 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
|
989 --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
990 +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
991 @@ -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
|
992 -II |
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 @@ -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
|
995 -VI |
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 $ 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
|
998 @ 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
|
999 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1000 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
|
1001 |
5275
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
1002 $ hg debugobsolete |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
1003 4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
1004 4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
1005 084ae625fa51ca8c441ba1d2bf0f974b21671017 aae2930509804c5a84e559eb9d631abeb9c0a340 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
1006 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d aae2930509804c5a84e559eb9d631abeb9c0a340 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
1007 aae2930509804c5a84e559eb9d631abeb9c0a340 8c2a6aae4bc5c1cc00c68276017dcef3d468e895 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
4493
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1008 $ 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
|
1009 @ 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
|
1010 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1011 x aae293050980 (4) <<<<<<< divergent |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5079
diff
changeset
|
1012 |\ reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
4493
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1013 | | 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
|
1014 | | --- 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
|
1015 | | +++ 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
|
1016 | | @@ -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
|
1017 | | -<<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1018 | | -E2||||||| base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1019 | | -E1======= |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1020 | | -E3>>>>>>> other |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1021 | | +E4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1022 | | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1023 | | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1024 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
|
1025 | | 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
|
1026 | | 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
|
1027 | | --- 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
|
1028 | | +++ 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
|
1029 | | @@ -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
|
1030 | | -E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1031 | | +<<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1032 | | +E2||||||| base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1033 | | +E1======= |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1034 | | +E3>>>>>>> other |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1035 | | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1036 | | 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
|
1037 | | --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1038 | | +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1039 | | @@ -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
|
1040 | | -D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1041 | | +d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1042 | | 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
|
1043 | | --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1044 | | +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1045 | | @@ -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
|
1046 | | -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1047 | | +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1048 | | 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
|
1049 | | --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1050 | | +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1051 | | @@ -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
|
1052 | | -II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1053 | | +ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1054 | | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1055 | | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1056 | 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
|
1057 |/ 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
|
1058 | 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
|
1059 | --- 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
|
1060 | +++ 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
|
1061 | @@ -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
|
1062 | -E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1063 | +<<<<<<< divergent |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1064 | +E2||||||| base |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1065 | +E1======= |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1066 | +E3>>>>>>> other |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1067 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1068 | 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
|
1069 | --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1070 | +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1071 | @@ -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
|
1072 | -four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1073 | +4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1074 | @@ -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
|
1075 | -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1076 | +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1077 | 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
|
1078 | --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1079 | +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1080 | @@ -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
|
1081 | -VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1082 | +vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1083 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1084 | |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1085 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
|
1086 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
|
1087 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
|
1088 --- 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
|
1089 +++ 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
|
1090 @@ -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
|
1091 -E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1092 +E2 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1093 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1094 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
|
1095 --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1096 +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1097 @@ -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
|
1098 -four |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1099 +4 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1100 @@ -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
|
1101 -7 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1102 +seven |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1103 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
|
1104 --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1105 +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1106 @@ -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
|
1107 -VI |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1108 +vi |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1109 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1110 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
|
1111 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
|
1112 --- 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
|
1113 +++ 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
|
1114 @@ -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
|
1115 -E1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1116 +E3 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1117 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1118 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
|
1119 --- a/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1120 +++ b/letters |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1121 @@ -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
|
1122 -D |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1123 +d |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1124 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
|
1125 --- a/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1126 +++ b/numbers |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1127 @@ -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
|
1128 -1 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1129 +one |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1130 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
|
1131 --- a/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1132 +++ b/romans |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1133 @@ -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
|
1134 -II |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1135 +ii |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1136 |
32446b7a6e7c
test: add test for content-divergence with file removal
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4492
diff
changeset
|
1137 |