Mercurial > evolve
annotate tests/test-evolve-issue5958.t @ 5791:2e1747baf550
pstatus: drop unnecessary CLI options
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 23 Feb 2021 06:06:06 +0800 |
parents | d7d954b6d518 |
children |
rev | line source |
---|---|
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 Content divergence and trying to relocate a node on top of itself (issue5958) |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 https://bz.mercurial-scm.org/show_bug.cgi?id=5958 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 $ . $TESTDIR/testlib/common.sh |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 $ cat << EOF >> $HGRCPATH |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 > [extensions] |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 > rebase = |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 > evolve = |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 > EOF |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 $ hg init issue5958 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 $ cd issue5958 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 $ echo hi > r0 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 $ hg ci -qAm 'add r0' |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 $ echo hi > foo.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 $ hg ci -qAm 'add foo.txt' |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 $ hg metaedit -r . -d '0 2' |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 (Make changes in unrelated files so that we don't have any merge conflicts |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 during the rebase, but the two touched revisions aren't identical) |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 $ echo hi > bar.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 $ hg add -q bar.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 $ hg amend -q |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 $ hg metaedit -r 1 -d '0 1' --hidden |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 2 new content-divergent changesets |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 $ hg log -r tip |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 changeset: 4:c17bf400a278 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 tag: tip |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 parent: 0:a24ed8ad918c |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 user: test |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 date: Wed Dec 31 23:59:59 1969 -0000 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 instability: content-divergent |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 summary: add foo.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 $ echo hi > baz.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 $ hg add -q baz.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
41 $ hg amend -q |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 $ hg rebase -qr tip -d 4 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 $ hg log -G |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 @ changeset: 6:08bc7ba82799 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 | tag: tip |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 | parent: 4:c17bf400a278 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
47 | user: test |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 | date: Wed Dec 31 23:59:58 1969 -0000 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
49 | instability: content-divergent |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 | summary: add foo.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
52 * changeset: 4:c17bf400a278 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
53 | parent: 0:a24ed8ad918c |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
54 | user: test |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
55 | date: Wed Dec 31 23:59:59 1969 -0000 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 | instability: content-divergent |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 | summary: add foo.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 o changeset: 0:a24ed8ad918c |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 user: test |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 date: Thu Jan 01 00:00:00 1970 +0000 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 summary: add r0 |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 |
5275
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
64 $ hg debugobsolete |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
65 cc71ffbc7c002d7b45fb694f9c060bf2e6920672 0065551bd38fe59ea4a069a4db378550c60122d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'metaedit', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
66 0065551bd38fe59ea4a069a4db378550c60122d3 a25dd7af6cf6731ff93708abb2b1b889eae848a0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
67 cc71ffbc7c002d7b45fb694f9c060bf2e6920672 c17bf400a2782394b1ca5fbbe59e30494f16dfdc 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'metaedit', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
68 a25dd7af6cf6731ff93708abb2b1b889eae848a0 1d1fc409af989f5c0843507e202d69a1ad16c5ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
417503ef667d
tests: add debugobsolete calls before many obslog calls
Martin von Zweigbergk <martinvonz@google.com>
parents:
5123
diff
changeset
|
69 1d1fc409af989f5c0843507e202d69a1ad16c5ef 08bc7ba82799f1e419190b0dac1b0e1c4b1355f9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'rebase', 'user': 'test'} |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 $ hg obslog -a -r . |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 @ 08bc7ba82799 (6) add foo.txt |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
72 | rewritten(parent, content) from 1d1fc409af98 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
74 | * c17bf400a278 (4) add foo.txt |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
75 | | date-changed(date) from cc71ffbc7c00 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 | | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 x | 1d1fc409af98 (5) add foo.txt |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
78 | | amended(content) from a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 | | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 x | a25dd7af6cf6 (3) add foo.txt |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
81 | | amended(content) from 0065551bd38f using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 | | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
83 x | 0065551bd38f (2) add foo.txt |
5301
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5297
diff
changeset
|
84 |/ date-changed(date) from cc71ffbc7c00 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
85 | |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 x cc71ffbc7c00 (1) add foo.txt |
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 |
4850
6d898fa6e5c3
evolve: check that relocating makes sense in _solvedivergent() (issue5958)
Anton Shestakov <av6@dwimlabs.net>
parents:
4849
diff
changeset
|
88 $ hg evolve --content-divergent |
5474
86c6c7951f74
evolve: fix content-div resolution when in parent-child form
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5473
diff
changeset
|
89 merge:[4] add foo.txt |
86c6c7951f74
evolve: fix content-div resolution when in parent-child form
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5473
diff
changeset
|
90 with: [6] add foo.txt |
4849
b9b6f421688a
tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 base: [1] add foo.txt |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
92 rebasing "other" content-divergent changeset 08bc7ba82799 on a24ed8ad918c |
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
93 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
94 working directory is now at d519bd54a945 |
5473
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
95 |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
96 $ hg log -G |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
97 @ changeset: 8:d519bd54a945 |
5473
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
98 | tag: tip |
5474
86c6c7951f74
evolve: fix content-div resolution when in parent-child form
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5473
diff
changeset
|
99 | parent: 0:a24ed8ad918c |
5473
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
100 | user: test |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
101 | date: Wed Dec 31 23:59:58 1969 -0000 |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
102 | summary: add foo.txt |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
103 | |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
104 o changeset: 0:a24ed8ad918c |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
105 user: test |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
106 date: Thu Jan 01 00:00:00 1970 +0000 |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
107 summary: add r0 |
b8bcf7562ea1
tests: add a log -G to demonstrate a fix in next patch
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5301
diff
changeset
|
108 |
5475
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
109 test that resolution is consistent and independent of divergent changeset we initiate the resolution from |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
110 |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
111 $ hg strip . --config extensions.strip= |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
112 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
113 saved backup bundle to $TESTTMP/issue5958/.hg/strip-backup/d519bd54a945-5f6b2f65-backup.hg |
5475
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
114 2 new content-divergent changesets |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
115 $ hg up 4 |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
117 $ hg evolve --content-divergent |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
118 merge:[4] add foo.txt |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
119 with: [7] add foo.txt |
5475
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
120 base: [1] add foo.txt |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
121 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
122 working directory is now at d519bd54a945 |
5475
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
123 $ hg log -G |
5572
d7d954b6d518
evolve: remove swapping nodes logic while resolving divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5475
diff
changeset
|
124 @ changeset: 8:d519bd54a945 |
5475
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
125 | tag: tip |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
126 | parent: 0:a24ed8ad918c |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
127 | user: test |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
128 | date: Wed Dec 31 23:59:58 1969 -0000 |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
129 | summary: add foo.txt |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
130 | |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
131 o changeset: 0:a24ed8ad918c |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
132 user: test |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
133 date: Thu Jan 01 00:00:00 1970 +0000 |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
134 summary: add r0 |
21956b2a16eb
evolve: add more testing for parent-child form content-div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
5474
diff
changeset
|
135 |