author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 24 Apr 2019 14:38:26 +0200 | |
changeset 4574 | 5e8c47c553db |
parent 4490 | 7a5c6109ee84 |
child 4512 | 7a779a288793 |
child 4577 | bcd52ce0916d |
permissions | -rw-r--r-- |
4481
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
1 |
====================================================== |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
2 |
Tests the resolution of content divergence: relocation |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
3 |
====================================================== |
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
4 |
|
d02a7c8cdee5
test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4424
diff
changeset
|
5 |
This file intend to cover case where changesets need to be moved to different parents |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
|
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
$ cat >> $HGRCPATH <<EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
> [alias] |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
10 |
> [phases] |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
11 |
> publish = False |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> [extensions] |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
13 |
> rebase = |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
|
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
17 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
18 |
Testing resolution of content-divergent changesets when they are on different |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
19 |
parents and resolution and relocation wont result in conflicts |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
20 |
------------------------------------------------------------------------------ |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
21 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
22 |
$ hg init multiparents |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
23 |
$ cd multiparents |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
24 |
$ echo ".*\.orig" > .hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
25 |
$ hg add .hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
26 |
$ hg ci -m "added hgignore" |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
27 |
$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
28 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
29 |
$ hg glog |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
30 |
@ 4:c41c793e0ef1 added d |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
31 |
| () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
32 |
o 3:ca1b80f7960a added c |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
33 |
| () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
34 |
o 2:b1661037fa25 added b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
35 |
| () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
36 |
o 1:c7586e2a9264 added a |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
37 |
| () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
38 |
o 0:8fa14d15e168 added hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
39 |
() [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
40 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
41 |
$ hg up .^^ |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
42 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
43 |
$ echo bar > b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
44 |
$ hg amend |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
45 |
2 new orphan changesets |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
46 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
47 |
$ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
48 |
rebasing 2:b1661037fa25 "added b" |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
49 |
2 new content-divergent changesets |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
50 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
51 |
$ hg glog |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
52 |
* 6:da4b96f4a8d6 added b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
53 |
| () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
54 |
| @ 5:7ed0642d644b added b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
55 |
| | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
56 |
| | * 4:c41c793e0ef1 added d |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
57 |
| | | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
58 |
| | * 3:ca1b80f7960a added c |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
59 |
| | | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
60 |
| | x 2:b1661037fa25 added b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
61 |
| |/ () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
62 |
| o 1:c7586e2a9264 added a |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
63 |
|/ () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
64 |
o 0:8fa14d15e168 added hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
65 |
() [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
66 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
67 |
$ hg evolve --content-divergent |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
68 |
merge:[5] added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
69 |
with: [6] added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
70 |
base: [2] added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
71 |
rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
72 |
updating to "local" side of the conflict: 7ed0642d644b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
73 |
merging "other" content-divergent changeset '11f849d7159f' |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
74 |
0 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:
3845
diff
changeset
|
75 |
working directory is now at 171614c9a791 |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
76 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
77 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
78 |
@ 8:171614c9a791 added b |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
79 |
| () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
80 |
| * 4:c41c793e0ef1 added d |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
81 |
| | () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
82 |
| * 3:ca1b80f7960a added c |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
83 |
| | () [default] draft |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
84 |
| x 2:b1661037fa25 added b |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
85 |
|/ () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
86 |
o 1:c7586e2a9264 added a |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
87 |
| () [default] draft |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
88 |
o 0:8fa14d15e168 added hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
89 |
() [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
90 |
|
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
91 |
$ hg exp |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
92 |
# HG changeset patch |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
93 |
# User test |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
94 |
# Date 0 0 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
95 |
# Thu Jan 01 00:00:00 1970 +0000 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
96 |
# Node ID 171614c9a7914c53f531373b95632323fdbbac8d |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
97 |
# Parent c7586e2a92645e473645847a7b69a6dc52be4276 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
98 |
added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
99 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
100 |
diff -r c7586e2a9264 -r 171614c9a791 b |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
101 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
102 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
103 |
@@ -0,0 +1,1 @@ |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
104 |
+bar |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
105 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
106 |
Resolving orphans to get back to a normal graph |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
107 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
108 |
$ hg evolve --all |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
109 |
move:[3] added c |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
110 |
atop:[8] added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
111 |
move:[4] added d |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
112 |
working directory is now at 4ae4427ee9f8 |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
113 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
114 |
@ 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
115 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
116 |
o 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
117 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
118 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
119 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
120 |
o 1:c7586e2a9264 added a |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
121 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
122 |
o 0:8fa14d15e168 added hgignore |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
123 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
124 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
125 |
More testing! |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
126 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
127 |
$ hg up .^^ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
128 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
129 |
$ echo x > x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
130 |
$ hg ci -Aqm "added x" |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
131 |
$ hg glog -r . |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
132 |
@ 11:71a392c714b5 added x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
133 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
134 |
~ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
135 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
136 |
$ echo foo > x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
137 |
$ hg branch bar |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
138 |
marked working directory as branch bar |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
139 |
(branches are permanent and global, did you want a bookmark?) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
140 |
$ hg amend -m "added foo to x" |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
141 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
142 |
$ hg up 71a392c714b5 --hidden |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
143 |
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:
3845
diff
changeset
|
144 |
updated to hidden changeset 71a392c714b5 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
145 |
(hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
146 |
working directory parent is obsolete! (71a392c714b5) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
147 |
(use 'hg evolve' to update to its successor: 1e1a50385a7d) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
148 |
$ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
149 |
rebasing 11:71a392c714b5 "added x" |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
150 |
2 new content-divergent changesets |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
151 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
152 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
153 |
@ 13:1e4f6b3bb39b added x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
154 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
155 |
| * 12:1e1a50385a7d added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
156 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
157 |
o | 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
158 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
159 |
o | 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
160 |
|/ () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
161 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
162 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
163 |
o 1:c7586e2a9264 added a |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
164 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
165 |
o 0:8fa14d15e168 added hgignore |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
166 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
167 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
168 |
$ hg evolve --content-divergent |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
169 |
merge:[13] added x |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
170 |
with: [12] added foo to x |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
171 |
base: [11] added x |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
172 |
rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
173 |
updating to "local" side of the conflict: 1e4f6b3bb39b |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
174 |
merging "other" content-divergent changeset '80cc9b1ec650' |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
175 |
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:
3845
diff
changeset
|
176 |
working directory is now at b006cf317e0e |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
177 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
178 |
$ hg exp |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
179 |
# HG changeset patch |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
180 |
# User test |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
181 |
# Date 0 0 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
182 |
# Thu Jan 01 00:00:00 1970 +0000 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
183 |
# Branch bar |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
184 |
# Node ID b006cf317e0ed16dbe786c439577475580f645f1 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
185 |
# Parent 4ae4427ee9f8f0935211fd66360948b77ab5aee9 |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
186 |
added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
187 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
188 |
diff -r 4ae4427ee9f8 -r b006cf317e0e x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
189 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
190 |
+++ b/x Thu Jan 01 00:00:00 1970 +0000 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
191 |
@@ -0,0 +1,1 @@ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
192 |
+foo |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
193 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
194 |
The above `hg exp` and the following log call demonstrates that message, content |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
195 |
and branch change is preserved in case of relocation |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
196 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
197 |
@ 15:b006cf317e0e added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
198 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
199 |
o 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
200 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
201 |
o 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
202 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
203 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
204 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
205 |
o 1:c7586e2a9264 added a |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
206 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
207 |
o 0:8fa14d15e168 added hgignore |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
208 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
209 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
210 |
Testing when both the content-divergence are on different parents and resolution |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
211 |
will lead to conflicts |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
212 |
--------------------------------------------------------------------------------- |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
213 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
214 |
$ hg up .^^^ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
215 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
216 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
217 |
$ echo y > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
218 |
$ hg ci -Aqm "added y" |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
219 |
$ hg glog -r . |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
220 |
@ 16:fc6ad2bac162 added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
221 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
222 |
~ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
223 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
224 |
$ echo bar > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
225 |
$ hg amend |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
226 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
227 |
$ hg up fc6ad2bac162 --hidden |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
228 |
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:
3845
diff
changeset
|
229 |
updated to hidden changeset fc6ad2bac162 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
230 |
(hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
231 |
working directory parent is obsolete! (fc6ad2bac162) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
232 |
(use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
233 |
$ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
234 |
rebasing 16:fc6ad2bac162 "added y" |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
235 |
2 new content-divergent changesets |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
236 |
$ echo wat > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
237 |
$ hg amend |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
238 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
239 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
240 |
@ 19:b4575ed6fcfc added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
241 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
242 |
| * 17:2a9f6ccbdeba added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
243 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
244 |
o | 15:b006cf317e0e added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
245 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
246 |
o | 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
247 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
248 |
o | 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
249 |
|/ () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
250 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
251 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
252 |
o 1:c7586e2a9264 added a |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
253 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
254 |
o 0:8fa14d15e168 added hgignore |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
255 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
256 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
257 |
$ hg evolve --content-divergent |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
258 |
merge:[19] added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
259 |
with: [17] added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
260 |
base: [16] added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
261 |
rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
262 |
updating to "local" side of the conflict: b4575ed6fcfc |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
263 |
merging "other" content-divergent changeset '48f745db3f53' |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
264 |
merging y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
265 |
warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
266 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
267 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
268 |
[1] |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
269 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
270 |
$ echo watbar > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
271 |
$ hg resolve -m |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
272 |
(no more unresolved files) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
273 |
continue: hg evolve --continue |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
274 |
$ hg evolve --continue |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
275 |
working directory is now at 7bbcf24ddecf |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
276 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
277 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
278 |
@ 21:7bbcf24ddecf added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
279 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
280 |
o 15:b006cf317e0e added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
281 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
282 |
o 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
283 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
284 |
o 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
285 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
286 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
287 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
288 |
o 1:c7586e2a9264 added a |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
289 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
290 |
o 0:8fa14d15e168 added hgignore |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
291 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
292 |
|
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
293 |
$ hg obslog -r . --all |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
294 |
@ 7bbcf24ddecf (21) added y |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
295 |
|\ |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
296 |
x | 48f745db3f53 (20) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
297 |
| | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
298 |
| | |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
299 |
| x b4575ed6fcfc (19) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
300 |
| | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
301 |
| | |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
302 |
x | 2a9f6ccbdeba (17) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
303 |
| | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
304 |
| | |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
305 |
| x 96b677f01b81 (18) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
306 |
|/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
307 |
| |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
308 |
x fc6ad2bac162 (16) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
309 |
rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
310 |
rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
311 |
|
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
312 |
|
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
313 |
checking that relocated commit is there |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
314 |
$ hg exp 48f745db3f53 --hidden |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
315 |
# HG changeset patch |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
316 |
# User test |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
317 |
# Date 0 0 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
318 |
# Thu Jan 01 00:00:00 1970 +0000 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
319 |
# Node ID 48f745db3f5300363ca248b9aeab20ff2a55fbb3 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
320 |
# Parent b006cf317e0ed16dbe786c439577475580f645f1 |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
321 |
added y |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
322 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
323 |
diff -r b006cf317e0e -r 48f745db3f53 y |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
324 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
325 |
+++ b/y Thu Jan 01 00:00:00 1970 +0000 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
326 |
@@ -0,0 +1,1 @@ |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
327 |
+bar |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
328 |
|
4406
450487b4e1a3
tests: update the title of a test as it's not what it says
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4181
diff
changeset
|
329 |
Testing when the relocation will result in conflicts and merging also: |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
330 |
---------------------------------------------------------------------- |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
331 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
332 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
333 |
@ 21:7bbcf24ddecf added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
334 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
335 |
o 15:b006cf317e0e added foo to x |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
336 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
337 |
o 10:4ae4427ee9f8 added d |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
338 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
339 |
o 9:917281f93fcb added c |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
340 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
341 |
o 8:171614c9a791 added b |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
342 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
343 |
o 1:c7586e2a9264 added a |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
344 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
345 |
o 0:8fa14d15e168 added hgignore |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
346 |
() [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
347 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
348 |
$ hg up .^^^^ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
349 |
0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
350 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
351 |
$ echo z > z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
352 |
$ hg ci -Aqm "added z" |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
353 |
$ hg glog -r . |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
354 |
@ 22:daf1de08f3b0 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
355 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
356 |
~ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
357 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
358 |
$ echo foo > y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
359 |
$ hg add y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
360 |
$ hg amend |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
361 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
362 |
$ hg up daf1de08f3b0 --hidden |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
363 |
0 files updated, 0 files merged, 1 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:
3845
diff
changeset
|
364 |
updated to hidden changeset daf1de08f3b0 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
365 |
(hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
366 |
working directory parent is obsolete! (daf1de08f3b0) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
367 |
(use 'hg evolve' to update to its successor: 3f7a1f693080) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
368 |
$ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
369 |
rebasing 22:daf1de08f3b0 "added z" |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
370 |
2 new content-divergent changesets |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
371 |
$ echo bar > z |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
372 |
$ hg amend |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
373 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
374 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
375 |
@ 25:53242575ffa9 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
376 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
377 |
| * 23:3f7a1f693080 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
378 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
379 |
o | 21:7bbcf24ddecf added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
380 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
381 |
o | 15:b006cf317e0e added foo to x |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
382 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
383 |
o | 10:4ae4427ee9f8 added d |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
384 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
385 |
o | 9:917281f93fcb added c |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
386 |
|/ () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
387 |
o 8:171614c9a791 added b |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
388 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
389 |
o 1:c7586e2a9264 added a |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
390 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
391 |
o 0:8fa14d15e168 added hgignore |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
392 |
() [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
393 |
|
4407
7fd0cbf6190d
evolve: change in a test which demonstrate divergence resolution can break
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4406
diff
changeset
|
394 |
$ hg evolve --content-divergent --any |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
395 |
merge:[25] added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
396 |
with: [23] added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
397 |
base: [22] added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
398 |
rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
399 |
merging y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
400 |
warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
3853
796334340cad
evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3852
diff
changeset
|
401 |
fix conflicts and see `hg help evolve.interrupted` |
796334340cad
evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3852
diff
changeset
|
402 |
[1] |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
403 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
404 |
$ hg diff |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
405 |
diff -r 7bbcf24ddecf y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
406 |
--- a/y Thu Jan 01 00:00:00 1970 +0000 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
407 |
+++ b/y Thu Jan 01 00:00:00 1970 +0000 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
408 |
@@ -1,1 +1,5 @@ |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
409 |
+<<<<<<< destination: 7bbcf24ddecf bar - test: added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
410 |
watbar |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
411 |
+======= |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
412 |
+foo |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
413 |
+>>>>>>> evolving: 3f7a1f693080 - test: added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
414 |
diff -r 7bbcf24ddecf z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
415 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
416 |
+++ b/z Thu Jan 01 00:00:00 1970 +0000 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
417 |
@@ -0,0 +1,1 @@ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
418 |
+z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
419 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
420 |
$ echo foo > y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
421 |
$ hg resolve -m |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
422 |
(no more unresolved files) |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
423 |
continue: hg evolve --continue |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
424 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
425 |
$ hg evolve --continue |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
426 |
evolving 23:3f7a1f693080 "added z" |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
427 |
updating to "local" side of the conflict: 53242575ffa9 |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
428 |
merging "other" content-divergent changeset 'cdb0643c69fc' |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
429 |
merging y |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
430 |
warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
431 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
432 |
fix conflicts and see `hg help evolve.interrupted` |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
433 |
[1] |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
434 |
|
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
435 |
$ hg diff |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
436 |
diff -r 53242575ffa9 y |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
437 |
--- a/y Thu Jan 01 00:00:00 1970 +0000 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
438 |
+++ b/y Thu Jan 01 00:00:00 1970 +0000 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
439 |
@@ -1,1 +1,5 @@ |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
440 |
+<<<<<<< local: 53242575ffa9 bar - test: added z |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
441 |
watbar |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
442 |
+======= |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
443 |
+foo |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
444 |
+>>>>>>> other: cdb0643c69fc - test: added z |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
445 |
|
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
446 |
$ echo foo > y |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
447 |
$ hg resolve -m |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
448 |
(no more unresolved files) |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
449 |
continue: hg evolve --continue |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
450 |
$ hg evolve --continue |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
451 |
working directory is now at 6fc7d9682de6 |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
452 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
453 |
$ hg glog |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
454 |
@ 27:6fc7d9682de6 added z |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
455 |
| () [bar] draft |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
456 |
o 21:7bbcf24ddecf added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
457 |
| () [bar] draft |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
458 |
o 15:b006cf317e0e added foo to x |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
459 |
| () [bar] draft |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
460 |
o 10:4ae4427ee9f8 added d |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
461 |
| () [default] draft |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
462 |
o 9:917281f93fcb added c |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
463 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
464 |
o 8:171614c9a791 added b |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
465 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
466 |
o 1:c7586e2a9264 added a |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
467 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
468 |
o 0:8fa14d15e168 added hgignore |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
469 |
() [default] draft |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
470 |
|
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
471 |
$ hg exp |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
472 |
# HG changeset patch |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
473 |
# User test |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
474 |
# Date 0 0 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
475 |
# Thu Jan 01 00:00:00 1970 +0000 |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
476 |
# Branch bar |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
477 |
# Node ID 6fc7d9682de6e3bee6c8b1266b756ed7d522b7e4 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
478 |
# Parent 7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
479 |
added z |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
480 |
|
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
481 |
diff -r 7bbcf24ddecf -r 6fc7d9682de6 y |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
482 |
--- a/y Thu Jan 01 00:00:00 1970 +0000 |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
483 |
+++ b/y Thu Jan 01 00:00:00 1970 +0000 |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
484 |
@@ -1,1 +1,1 @@ |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
485 |
-watbar |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
486 |
+foo |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
487 |
diff -r 7bbcf24ddecf -r 6fc7d9682de6 z |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
488 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
489 |
+++ b/z Thu Jan 01 00:00:00 1970 +0000 |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
490 |
@@ -0,0 +1,1 @@ |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
491 |
+bar |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
492 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
493 |
$ cd .. |