Mercurial > evolve
annotate tests/test-evolve-content-divergence.t @ 3845:5c964ebe4d4b
evolve: always order the revs to be evolved
The current code only order the revs if we are resolving orphans and not in
other case. The ordering is important when we pass --all and tackle multiple
occurence of the same instability.
Let's order the revs for each instability. There are enough test coverage of
phase-divergence and content-divergence that I feel confident doing it because
none of the test changed.
The change in test-evolve-content-divergent.t demonstrates the indeed ordering
helped.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 12 Jun 2018 23:20:54 +0530 |
parents | 48fbccfd1dff |
children | f9dad99a90d5 |
rev | line source |
---|---|
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 ** Test for handling of content divergent changesets by `hg evolve` ** |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 ==================================================================== |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 $ cat >> $HGRCPATH <<EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 > [alias] |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 > 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
|
7 > [phases] |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
8 > publish = False |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 > [extensions] |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
10 > rebase = |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 > EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 $ 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
|
13 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 $ hg init cdiv |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 $ cd cdiv |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 $ echo ".*\.orig" > .hgignore |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 $ hg add .hgignore |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 $ hg ci -m "added hgignore" |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 $ hg glog |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 @ 4:c41c793e0ef1 added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 o 3:ca1b80f7960a added c |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 o 2:b1661037fa25 added b |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 o 1:c7586e2a9264 added a |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 o 0:8fa14d15e168 added hgignore |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
33 Creating content-divergence with branch change where base, divergent and other |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
34 have different branches |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
35 ------------------------------------------------------------------------------- |
3790
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 $ hg branch -r . foobar |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 changed branch on 1 changesets |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 $ hg up c41c793e0ef1 --hidden |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 updated to hidden changeset c41c793e0ef1 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 working directory parent is obsolete! (c41c793e0ef1) |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 $ echo bar > d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 $ hg branch watwat |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 marked working directory as branch watwat |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 $ hg amend |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 2 new content-divergent changesets |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 $ hg glog |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 @ 6:264b04f771fb added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 | () [watwat] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 | * 5:9e5dffcb3d48 added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |/ () [foobar] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 o 3:ca1b80f7960a added c |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 o 2:b1661037fa25 added b |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 o 1:c7586e2a9264 added a |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 o 0:8fa14d15e168 added hgignore |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 $ hg evolve --content-divergent --config ui.interactive=True<<EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 > c |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 > EOF |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 merge:[6] added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 with: [5] added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 base: [4] added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 merging "other" content-divergent changeset '9e5dffcb3d48' |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 content divergent changesets on different branches. |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 working directory is now at 23a4467c278e |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 $ hg glog |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 @ 7:23a4467c278e added d |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 | () [foobar] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 o 3:ca1b80f7960a added c |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 o 2:b1661037fa25 added b |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 o 1:c7586e2a9264 added a |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 | () [default] draft |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 o 0:8fa14d15e168 added hgignore |
5b9e3aaa6da8
evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 () [default] draft |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
89 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
90 Testing merging of commit messages |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
91 ----------------------------------- |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
92 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
93 When base and one of the divergent has same commit messages and other divergent |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
94 has different one |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
95 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
96 $ echo wat > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
97 $ hg amend |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
98 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
99 $ hg up .^ |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
100 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
101 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
102 $ echo bar > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
103 $ hg ci -Aqm "added a d with bar in it, expect some beers" |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
104 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
105 $ hg prune -r 23a4467c278e -s . --hidden |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
106 1 changesets pruned |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
107 2 new content-divergent changesets |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
108 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
109 $ hg glog |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
110 @ 9:59081c9c425a added a d with bar in it, expect some beers |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
111 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
112 | * 8:36618f77f252 added d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
113 |/ () [foobar] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
114 o 3:ca1b80f7960a added c |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
115 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
116 o 2:b1661037fa25 added b |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
117 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
118 o 1:c7586e2a9264 added a |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
119 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
120 o 0:8fa14d15e168 added hgignore |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
121 () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
122 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
123 $ hg evolve --content-divergent |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
124 merge:[9] added a d with bar in it, expect some beers |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
125 with: [8] added d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
126 base: [7] added d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
127 merging "other" content-divergent changeset '36618f77f252' |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
129 working directory is now at ca80aeaf4ee8 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
130 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
131 $ hg glog |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
132 @ 10:ca80aeaf4ee8 added a d with bar in it, expect some beers |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
133 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
134 o 3:ca1b80f7960a added c |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
135 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
136 o 2:b1661037fa25 added b |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
137 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
138 o 1:c7586e2a9264 added a |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
139 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
140 o 0:8fa14d15e168 added hgignore |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
141 () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
142 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
143 When base has different message and both divergents has same one |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
144 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
145 $ echo foo > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
146 $ hg amend -m "foo to d" |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
147 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
148 $ hg up ca80aeaf4ee8 --hidden |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
150 updated to hidden changeset ca80aeaf4ee8 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
151 (hidden revision 'ca80aeaf4ee8' was rewritten as: eba0b02801cb) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
152 working directory parent is obsolete! (ca80aeaf4ee8) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
153 (use 'hg evolve' to update to its successor: eba0b02801cb) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
154 $ echo babar > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
155 $ hg amend -m "foo to d" |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
156 2 new content-divergent changesets |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
157 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
158 $ hg glog |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
159 @ 12:0116315a1a4a foo to d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
160 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
161 | * 11:eba0b02801cb foo to d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
162 |/ () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
163 o 3:ca1b80f7960a added c |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
164 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
165 o 2:b1661037fa25 added b |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
166 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
167 o 1:c7586e2a9264 added a |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
168 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
169 o 0:8fa14d15e168 added hgignore |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
170 () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
171 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
172 $ hg evolve --content-divergent |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
173 merge:[12] foo to d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
174 with: [11] foo to d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
175 base: [10] added a d with bar in it, expect some beers |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
176 merging "other" content-divergent changeset 'eba0b02801cb' |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
177 merging d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
178 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3842
b293cce4ff55
evolve: point to `hg help evolve.interrupted` while resolving content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3811
diff
changeset
|
180 abort: fix conflicts and see `hg help evolve.interrupted` |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
181 [255] |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
182 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
183 $ echo foobar > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
184 $ hg resolve -m |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
185 (no more unresolved files) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
186 continue: hg evolve --continue |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
187 $ hg evolve --continue |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
188 working directory is now at 3e0a8df515d6 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
189 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
190 $ hg glog |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
191 @ 13:3e0a8df515d6 foo to d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
192 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
193 o 3:ca1b80f7960a added c |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
194 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
195 o 2:b1661037fa25 added b |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
196 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
197 o 1:c7586e2a9264 added a |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
198 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
199 o 0:8fa14d15e168 added hgignore |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
200 () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
201 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
202 When all three base, divergent and other has different commit messages creating |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
203 conflicts |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
204 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
205 $ echo bar > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
206 $ hg amend -m "bar to d, expect beers" |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
207 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
208 $ hg up 3e0a8df515d6 --hidden |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
209 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
210 updated to hidden changeset 3e0a8df515d6 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
211 (hidden revision '3e0a8df515d6' was rewritten as: 9ad4721c9004) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
212 working directory parent is obsolete! (3e0a8df515d6) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
213 (use 'hg evolve' to update to its successor: 9ad4721c9004) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
214 $ echo wat > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
215 $ hg amend -m "wat to d, wat?" |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
216 2 new content-divergent changesets |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
217 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
218 $ hg glog |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
219 @ 15:1e834b60df1b wat to d, wat? |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
220 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
221 | * 14:9ad4721c9004 bar to d, expect beers |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
222 |/ () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
223 o 3:ca1b80f7960a added c |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
224 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
225 o 2:b1661037fa25 added b |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
226 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
227 o 1:c7586e2a9264 added a |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
228 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
229 o 0:8fa14d15e168 added hgignore |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
230 () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
231 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
232 $ hg evolve --content-divergent |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
233 merge:[15] wat to d, wat? |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
234 with: [14] bar to d, expect beers |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
235 base: [13] foo to d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
236 merging "other" content-divergent changeset '9ad4721c9004' |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
237 merging d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
238 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
239 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3842
b293cce4ff55
evolve: point to `hg help evolve.interrupted` while resolving content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3811
diff
changeset
|
240 abort: fix conflicts and see `hg help evolve.interrupted` |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
241 [255] |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
242 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
243 $ echo watbar > d |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
244 $ hg resolve -m |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
245 (no more unresolved files) |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
246 continue: hg evolve --continue |
3802
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
247 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
248 $ cat > editor.sh <<EOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
249 > #!/bin/sh |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
250 > printf "**showing editors text**\n\n" |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
251 > cat \$1 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
252 > printf "\n**done showing editors text**\n\n" |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
253 > cat > \$1 <<ENDOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
254 > watbar to d |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
255 > ENDOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
256 > EOF |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
257 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
258 $ HGEDITOR='sh ./editor.sh' hg evolve --continue |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
259 **showing editors text** |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
260 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
261 HG: Conflicts while merging changeset description of content-divergent changesets. |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
262 HG: Resolve conflicts in commit messages to continue. |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
263 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
264 <<<<<<< divergent |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
265 wat to d, wat?||||||| base |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
266 foo to d======= |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
267 bar to d, expect beers>>>>>>> other |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
268 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
269 **done showing editors text** |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
270 |
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
271 working directory is now at 00f8d08aea43 |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
272 |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
273 $ hg glog |
3802
4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3801
diff
changeset
|
274 @ 16:00f8d08aea43 watbar to d |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
275 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
276 o 3:ca1b80f7960a added c |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
277 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
278 o 2:b1661037fa25 added b |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
279 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
280 o 1:c7586e2a9264 added a |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
281 | () [default] draft |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
282 o 0:8fa14d15e168 added hgignore |
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
283 () [default] draft |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
284 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
285 $ cd .. |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
286 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
287 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
|
288 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
|
289 ------------------------------------------------------------------------------ |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
290 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
291 $ hg init multiparents |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
292 $ cd multiparents |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
293 $ echo ".*\.orig" > .hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
294 $ hg add .hgignore |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
295 $ 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
|
296 $ 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
|
297 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
298 $ hg glog |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
299 @ 4:c41c793e0ef1 added d |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
300 | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
301 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
|
302 | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
303 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
|
304 | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
305 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
|
306 | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
307 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
|
308 () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
309 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
310 $ hg up .^^ |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
311 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
|
312 $ echo bar > b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
313 $ hg amend |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
314 2 new orphan changesets |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
315 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
316 $ 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
|
317 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
|
318 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
|
319 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
320 $ hg glog |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
321 * 6:da4b96f4a8d6 added b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
322 | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
323 | @ 5:7ed0642d644b added b |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
324 | | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
325 | | * 4:c41c793e0ef1 added d |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
326 | | | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
327 | | * 3:ca1b80f7960a added c |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
328 | | | () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
329 | | 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
|
330 | |/ () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
331 | 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
|
332 |/ () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
333 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
|
334 () [default] draft |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
335 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
336 $ 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
|
337 merge:[5] added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
338 with: [6] added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
339 base: [2] added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
340 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
|
341 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
|
342 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
|
343 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
344 nothing changed |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
345 |
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
346 $ hg glog |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
347 @ 5:7ed0642d644b added b |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
348 | () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
349 | * 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
|
350 | | () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
351 | * 3:ca1b80f7960a added c |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
352 | | () [default] draft |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
353 | 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
|
354 |/ () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
355 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
|
356 | () [default] draft |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
357 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
|
358 () [default] draft |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
359 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
360 $ hg exp |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
361 # HG changeset patch |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
362 # User test |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
363 # Date 0 0 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
364 # 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
|
365 # Node ID 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
366 # Parent c7586e2a92645e473645847a7b69a6dc52be4276 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
367 added b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
368 |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
369 diff -r c7586e2a9264 -r 7ed0642d644b b |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
370 --- /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
|
371 +++ 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
|
372 @@ -0,0 +1,1 @@ |
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
373 +bar |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
374 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
375 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
|
376 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
377 $ hg evolve --all |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
378 move:[3] added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
379 atop:[5] added b |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
380 move:[4] added d |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
381 atop:[8] added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
382 working directory is now at b6b20b8eefdc |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
383 $ hg glog |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
384 @ 9:b6b20b8eefdc added d |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
385 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
386 o 8:7c46f743e62f added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
387 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
388 o 5:7ed0642d644b added b |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
389 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
390 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
|
391 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
392 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
|
393 () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
394 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
395 More testing! |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
396 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
397 $ hg up .^^ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
398 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
|
399 $ echo x > x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
400 $ 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
|
401 $ hg glog -r . |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
402 @ 10:cfae5f87cd34 added x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
403 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
404 ~ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
405 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
406 $ echo foo > x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
407 $ hg branch bar |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
408 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
|
409 (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
|
410 $ 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
|
411 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
412 $ hg up cfae5f87cd34 --hidden |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
413 1 files updated, 0 files merged, 0 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
|
414 updated to hidden changeset cfae5f87cd34 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
415 (hidden revision 'cfae5f87cd34' was rewritten as: 580d9d182d90) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
416 working directory parent is obsolete! (cfae5f87cd34) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
417 (use 'hg evolve' to update to its successor: 580d9d182d90) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
418 $ hg rebase -r . -d b6b20b8eefdc --config experimental.evolution.allowdivergence=True |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
419 rebasing 10:cfae5f87cd34 "added x" |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
420 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
|
421 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
422 $ hg glog |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
423 @ 12:c4d1990428e3 added x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
424 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
425 | * 11:580d9d182d90 added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
426 | | () [bar] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
427 o | 9:b6b20b8eefdc added d |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
428 | | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
429 o | 8:7c46f743e62f added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
430 |/ () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
431 o 5:7ed0642d644b added b |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
432 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
433 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
|
434 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
435 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
|
436 () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
437 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
438 $ hg evolve --content-divergent |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
439 merge:[12] added x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
440 with: [11] added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
441 base: [10] added x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
442 rebasing "other" content-divergent changeset 580d9d182d90 on b6b20b8eefdc |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
443 updating to "local" side of the conflict: c4d1990428e3 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
444 merging "other" content-divergent changeset 'd3bfc0b3f350' |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
445 1 files updated, 0 files merged, 0 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
|
446 working directory is now at be41fdcd0ee1 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
447 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
448 $ hg exp |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
449 # HG changeset patch |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
450 # User test |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
451 # Date 0 0 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
452 # 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
|
453 # Branch bar |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
454 # Node ID be41fdcd0ee181081c4e42c6ee333d3dc3b3ab45 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
455 # Parent b6b20b8eefdce1f32126c71d20bdb72a62b38268 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
456 added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
457 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
458 diff -r b6b20b8eefdc -r be41fdcd0ee1 x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
459 --- /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
|
460 +++ 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
|
461 @@ -0,0 +1,1 @@ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
462 +foo |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
463 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
464 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
|
465 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
|
466 $ hg glog |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
467 @ 14:be41fdcd0ee1 added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
468 | () [bar] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
469 o 9:b6b20b8eefdc added d |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
470 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
471 o 8:7c46f743e62f added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
472 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
473 o 5:7ed0642d644b added b |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
474 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
475 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
|
476 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
477 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
|
478 () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
479 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
480 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
|
481 will lead to conflicts |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
482 --------------------------------------------------------------------------------- |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
483 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
484 $ hg up .^^^ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
485 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
|
486 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
487 $ echo y > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
488 $ 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
|
489 $ hg glog -r . |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
490 @ 15:9c30046901ab added y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
491 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
492 ~ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
493 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
494 $ echo bar > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
495 $ hg amend |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
496 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
497 $ hg up 9c30046901ab --hidden |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
498 1 files updated, 0 files merged, 0 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
|
499 updated to hidden changeset 9c30046901ab |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
500 (hidden revision '9c30046901ab' was rewritten as: 29e08829c51f) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
501 working directory parent is obsolete! (9c30046901ab) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
502 (use 'hg evolve' to update to its successor: 29e08829c51f) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
503 $ hg rebase -r . -d be41fdcd0ee1 --config experimental.evolution.allowdivergence=True |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
504 rebasing 15:9c30046901ab "added y" |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
505 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
|
506 $ echo wat > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
507 $ hg amend |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
508 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
509 $ hg glog |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
510 @ 18:4065e1d314c3 added y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
511 | () [bar] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
512 | * 16:29e08829c51f added y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
513 | | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
514 o | 14:be41fdcd0ee1 added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
515 | | () [bar] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
516 o | 9:b6b20b8eefdc added d |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
517 | | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
518 o | 8:7c46f743e62f added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
519 |/ () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
520 o 5:7ed0642d644b added b |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
521 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
522 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
|
523 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
524 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
|
525 () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
526 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
527 $ hg evolve --content-divergent |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
528 merge:[18] added y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
529 with: [16] added y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
530 base: [15] added y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
531 rebasing "other" content-divergent changeset 29e08829c51f on be41fdcd0ee1 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
532 updating to "local" side of the conflict: 4065e1d314c3 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
533 merging "other" content-divergent changeset '6d515d1ffc69' |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
534 merging y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
535 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
|
536 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3842
b293cce4ff55
evolve: point to `hg help evolve.interrupted` while resolving content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3811
diff
changeset
|
537 abort: fix conflicts and see `hg help evolve.interrupted` |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
538 [255] |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
539 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
540 $ echo watbar > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
541 $ hg resolve -m |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
542 (no more unresolved files) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
543 continue: hg evolve --continue |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
544 $ hg evolve --continue |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
545 working directory is now at bbaca013758a |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
546 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
547 $ hg glog |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
548 @ 20:bbaca013758a added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
549 | () [bar] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
550 o 14:be41fdcd0ee1 added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
551 | () [bar] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
552 o 9:b6b20b8eefdc added d |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
553 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
554 o 8:7c46f743e62f added c |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
555 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
556 o 5:7ed0642d644b added b |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
557 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
558 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
|
559 | () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
560 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
|
561 () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
562 |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
563 $ hg obslog -r . --all |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
564 @ bbaca013758a (20) added y |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
565 |\ |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
566 x | 4065e1d314c3 (18) added y |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
567 | | rewritten(content) as bbaca013758a using amend by test (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
|
568 | | |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
569 | x 6d515d1ffc69 (19) added y |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
570 | | rewritten(branch, content) as bbaca013758a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
571 | | |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
572 | x 29e08829c51f (16) added y |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
573 | | rewritten(parent) as 6d515d1ffc69 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
574 | | |
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
575 x | f1d75198aac4 (17) added y |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
576 |/ rewritten(content) as 4065e1d314c3 using amend by test (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
|
577 | |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
578 x 9c30046901ab (15) added y |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
579 rewritten(content) as 29e08829c51f using amend by test (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
|
580 rewritten(branch, parent) as f1d75198aac4 using rebase by test (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
|
581 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
582 |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
583 checking that relocated commit is there |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
584 $ hg exp 6d515d1ffc69 --hidden |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
585 # HG changeset patch |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
586 # User test |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
587 # Date 0 0 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
588 # 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
|
589 # Node ID 6d515d1ffc6925b036c933078ccb804c26da80b2 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
590 # Parent be41fdcd0ee181081c4e42c6ee333d3dc3b3ab45 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
591 added y |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
592 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
593 diff -r be41fdcd0ee1 -r 6d515d1ffc69 y |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
594 --- /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
|
595 +++ 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
|
596 @@ -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
|
597 +bar |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
598 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
599 Testing when the relocation will result in conflicts and merging wont |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
600 ---------------------------------------------------------------------- |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
601 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
602 $ hg glog |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
603 @ 20:bbaca013758a added y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
604 | () [bar] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
605 o 14:be41fdcd0ee1 added foo to x |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
606 | () [bar] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
607 o 9:b6b20b8eefdc added d |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
608 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
609 o 8:7c46f743e62f added c |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
610 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
611 o 5:7ed0642d644b added b |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
612 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
613 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
|
614 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
615 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
|
616 () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
617 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
618 $ hg up .^^^^ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
619 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
|
620 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
621 $ echo z > z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
622 $ 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
|
623 $ hg glog -r . |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
624 @ 21:884c9d1a1a84 added z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
625 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
626 ~ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
627 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
628 $ echo foo > y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
629 $ hg add y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
630 $ hg amend |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
631 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
632 $ hg up 884c9d1a1a84 --hidden |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
633 0 files updated, 0 files merged, 1 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
|
634 updated to hidden changeset 884c9d1a1a84 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
635 (hidden revision '884c9d1a1a84' was rewritten as: 3e22a949fe7d) |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
636 working directory parent is obsolete! (884c9d1a1a84) |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
637 (use 'hg evolve' to update to its successor: 3e22a949fe7d) |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
638 $ hg rebase -r . -d bbaca013758a --config experimental.evolution.allowdivergence=True |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
639 rebasing 21:884c9d1a1a84 "added z" |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
640 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
|
641 $ echo bar > z |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
642 $ hg amend |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
643 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
644 $ hg glog |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
645 @ 24:d2eca78cc588 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
646 | () [bar] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
647 | * 22:3e22a949fe7d added z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
648 | | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
649 o | 20:bbaca013758a added y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
650 | | () [bar] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
651 o | 14:be41fdcd0ee1 added foo to x |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
652 | | () [bar] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
653 o | 9:b6b20b8eefdc added d |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
654 | | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
655 o | 8:7c46f743e62f added c |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
656 |/ () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
657 o 5:7ed0642d644b added b |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
658 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
659 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
|
660 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
661 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
|
662 () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
663 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
664 $ hg evolve --content-divergent |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
665 merge:[24] added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
666 with: [22] added z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
667 base: [21] added z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
668 rebasing "other" content-divergent changeset 3e22a949fe7d on bbaca013758a |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
669 merging y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
670 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
671 abort: unresolved merge conflicts (see hg help resolve) |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
672 [255] |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
673 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
674 $ hg diff |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
675 diff -r bbaca013758a y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
676 --- 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
|
677 +++ 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
|
678 @@ -1,1 +1,5 @@ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
679 +<<<<<<< destination: bbaca013758a bar - test: added y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
680 watbar |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
681 +======= |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
682 +foo |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
683 +>>>>>>> evolving: 3e22a949fe7d - test: added z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
684 diff -r bbaca013758a z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
685 --- /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
|
686 +++ 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
|
687 @@ -0,0 +1,1 @@ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
688 +z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
689 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
690 $ echo foo > y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
691 $ hg resolve -m |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
692 (no more unresolved files) |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
693 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
|
694 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
695 $ hg evolve --continue |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
696 working directory is now at a15eb4e32166 |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
697 |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
698 $ hg glog |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
699 @ 25:a15eb4e32166 added z |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
700 | () [default] draft |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
701 o 20:bbaca013758a added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
702 | () [bar] draft |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
703 o 14:be41fdcd0ee1 added foo to x |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
704 | () [bar] draft |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
705 o 9:b6b20b8eefdc added d |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
706 | () [default] draft |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
707 o 8:7c46f743e62f added c |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
708 | () [default] draft |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
709 o 5:7ed0642d644b added b |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
710 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
711 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
|
712 | () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
713 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
|
714 () [default] draft |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
715 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
716 XXX: z should have bar inside, the merge definitely did not happen |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
717 $ hg exp |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
718 # HG changeset patch |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
719 # User test |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
720 # Date 0 0 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
721 # Thu Jan 01 00:00:00 1970 +0000 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
722 # Node ID a15eb4e32166b0652fdec4c1dd30c9d668323bac |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
723 # Parent bbaca013758a55364955939e2d2e4536cb8d05cf |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
724 added z |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
725 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
726 diff -r bbaca013758a -r a15eb4e32166 y |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
727 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
728 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
729 @@ -1,1 +1,1 @@ |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
730 -watbar |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
731 +foo |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
732 diff -r bbaca013758a -r a15eb4e32166 z |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
733 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
734 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
735 @@ -0,0 +1,1 @@ |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
736 +z |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
737 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
738 $ cd .. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
739 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
740 Resolving content-divergence of a stack with same parents |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
741 --------------------------------------------------------- |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
742 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
743 $ hg init stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
744 $ cd stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
745 $ echo ".*\.orig" > .hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
746 $ hg add .hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
747 $ hg ci -m "added hgignore" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
748 $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
749 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
750 $ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
751 @ 4:c41c793e0ef1 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
752 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
753 o 3:ca1b80f7960a added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
754 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
755 o 2:b1661037fa25 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
756 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
757 o 1:c7586e2a9264 added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
758 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
759 o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
760 () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
761 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
762 $ cd .. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
763 $ hg init stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
764 $ cd stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
765 $ hg pull ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
766 pulling from ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
767 requesting all changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
768 adding changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
769 adding manifests |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
770 adding file changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
771 added 5 changesets with 5 changes to 5 files |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
772 new changesets 8fa14d15e168:c41c793e0ef1 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
773 (run 'hg update' to get a working copy) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
774 $ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
775 o 4:c41c793e0ef1 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
776 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
777 o 3:ca1b80f7960a added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
778 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
779 o 2:b1661037fa25 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
780 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
781 o 1:c7586e2a9264 added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
782 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
783 o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
784 () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
785 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
786 $ hg up c7586e2a9264 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
787 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
788 $ echo bar > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
789 $ hg amend -m "watbar to a" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
790 3 new orphan changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
791 $ hg evolve --all |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
792 move:[2] added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
793 atop:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
794 move:[3] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
795 atop:[6] added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
796 move:[4] added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
797 atop:[7] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
798 working directory is now at 513e3267034e |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
799 $ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
800 @ 8:513e3267034e added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
801 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
802 o 7:accb7a2b6ae9 added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
803 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
804 o 6:60280764eb0e added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
805 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
806 o 5:2587cb3ef1fe watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
807 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
808 o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
809 () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
810 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
811 $ cd ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
812 $ hg up .^^^ |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
813 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
814 $ echo wat > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
815 $ hg amend -m "watbar to a" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
816 3 new orphan changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
817 $ hg evolve --all |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
818 move:[2] added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
819 atop:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
820 move:[3] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
821 atop:[6] added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
822 move:[4] added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
823 atop:[7] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
824 working directory is now at c72d2885eb51 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
825 $ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
826 @ 8:c72d2885eb51 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
827 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
828 o 7:3ce4be6d8e5e added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
829 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
830 o 6:d5f148423c16 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
831 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
832 o 5:8e222f257bbf watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
833 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
834 o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
835 () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
836 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
837 $ hg pull ../stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
838 pulling from ../stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
839 searching for changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
840 adding changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
841 adding manifests |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
842 adding file changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
843 added 4 changesets with 1 changes to 4 files (+1 heads) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
844 4 new obsolescence markers |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
845 8 new content-divergent changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
846 new changesets 2587cb3ef1fe:513e3267034e |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
847 (run 'hg heads' to see heads, 'hg merge' to merge) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
848 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
849 $ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
850 * 12:513e3267034e added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
851 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
852 * 11:accb7a2b6ae9 added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
853 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
854 * 10:60280764eb0e added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
855 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
856 * 9:2587cb3ef1fe watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
857 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
858 | @ 8:c72d2885eb51 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
859 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
860 | * 7:3ce4be6d8e5e added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
861 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
862 | * 6:d5f148423c16 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
863 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
864 | * 5:8e222f257bbf watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
865 |/ () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
866 o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
867 () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
868 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
869 XXX: we are not resolving divergence in the correct order here |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
870 $ hg evolve --all --content-divergent |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
871 merge:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
872 with: [9] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
873 base: [1] added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
874 updating to "local" side of the conflict: 8e222f257bbf |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
875 merging "other" content-divergent changeset '2587cb3ef1fe' |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
876 merging a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
877 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
878 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
879 abort: fix conflicts and see `hg help evolve.interrupted` |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
880 [255] |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
881 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
882 $ echo watbar > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
883 $ hg resolve -m |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
884 (no more unresolved files) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
885 continue: hg evolve --continue |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
886 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
887 $ hg evolve --continue |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
888 6 new orphan changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
889 skipping d5f148423c16: have a different parent than 60280764eb0e (not handled yet) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
890 | d5f148423c16, 60280764eb0e are not based on the same changeset. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
891 | With the current state of its implementation, |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
892 | evolve does not work in that case. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
893 | rebase one of them next to the other and run |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
894 | this command again. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
895 | - either: hg rebase --dest 'p1(d5f148423c16)' -r 60280764eb0e |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
896 | - or: hg rebase --dest 'p1(60280764eb0e)' -r d5f148423c16 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
897 skipping 3ce4be6d8e5e: have a different parent than accb7a2b6ae9 (not handled yet) |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
898 | 3ce4be6d8e5e, accb7a2b6ae9 are not based on the same changeset. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
899 | With the current state of its implementation, |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
900 | evolve does not work in that case. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
901 | rebase one of them next to the other and run |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
902 | this command again. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
903 | - either: hg rebase --dest 'p1(3ce4be6d8e5e)' -r accb7a2b6ae9 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
904 | - or: hg rebase --dest 'p1(accb7a2b6ae9)' -r 3ce4be6d8e5e |
3845
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
905 skipping c72d2885eb51: have a different parent than 513e3267034e (not handled yet) |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
906 | c72d2885eb51, 513e3267034e are not based on the same changeset. |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
907 | With the current state of its implementation, |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
908 | evolve does not work in that case. |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
909 | rebase one of them next to the other and run |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
910 | this command again. |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
911 | - either: hg rebase --dest 'p1(c72d2885eb51)' -r 513e3267034e |
5c964ebe4d4b
evolve: always order the revs to be evolved
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3844
diff
changeset
|
912 | - or: hg rebase --dest 'p1(513e3267034e)' -r c72d2885eb51 |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
913 working directory is now at df46e196f3c4 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
914 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
915 $ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
916 @ 13:df46e196f3c4 watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
917 | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
918 | * 12:513e3267034e added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
919 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
920 | * 11:accb7a2b6ae9 added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
921 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
922 | * 10:60280764eb0e added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
923 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
924 | x 9:2587cb3ef1fe watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
925 |/ () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
926 | * 8:c72d2885eb51 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
927 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
928 | * 7:3ce4be6d8e5e added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
929 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
930 | * 6:d5f148423c16 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
931 | | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
932 | x 5:8e222f257bbf watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
933 |/ () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
934 o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
935 () [default] draft |