author | Boris Feld <boris.feld@octobus.net> |
Wed, 07 Nov 2018 19:35:48 +0100 | |
branch | stable |
changeset 4223 | 4a3d588e5311 |
parent 4197 | 1dd5c6e6cd53 |
child 4202 | f555039d1a08 |
child 4406 | 450487b4e1a3 |
child 4419 | 1fdecdfd0df9 |
permissions | -rw-r--r-- |
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
76 |
working directory is now at 0ac42f1bc15c |
3790
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
79 |
@ 7:0ac42f1bc15c added d |
3790
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 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
105 |
$ hg prune -r 0ac42f1bc15c -s . --hidden |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
112 |
| * 8:f621d00f5f0e added d |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
127 |
merging "other" content-divergent changeset 'f621d00f5f0e' |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
129 |
working directory is now at a9d6fd6b5e40 |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
132 |
@ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers |
3801
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 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
148 |
$ hg up a9d6fd6b5e40 --hidden |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
150 |
updated to hidden changeset a9d6fd6b5e40 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
151 |
(hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
152 |
working directory parent is obsolete! (a9d6fd6b5e40) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
153 |
(use 'hg evolve' to update to its successor: b10b07a394f1) |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
159 |
@ 12:0bb497fed24a foo to d |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
160 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
161 |
| * 11:b10b07a394f1 foo to d |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
176 |
merging "other" content-divergent changeset 'b10b07a394f1' |
3801
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 |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
180 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
181 |
[1] |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
188 |
working directory is now at 11175423b5dc |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
191 |
@ 13:11175423b5dc foo to d |
3801
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 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
208 |
$ hg up 11175423b5dc --hidden |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
210 |
updated to hidden changeset 11175423b5dc |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
211 |
(hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
212 |
working directory parent is obsolete! (11175423b5dc) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
213 |
(use 'hg evolve' to update to its successor: 27f0463f169a) |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
219 |
@ 15:f542037ddf31 wat to d, wat? |
3801
ee78135b2f45
evolve: merge commit messages while resolving content-divergence (issue5877)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3790
diff
changeset
|
220 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
221 |
| * 14:27f0463f169a bar to d, expect beers |
3801
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
236 |
merging "other" content-divergent changeset '27f0463f169a' |
3801
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 |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
240 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
241 |
[1] |
3801
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 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
271 |
working directory is now at 89ea3eee2d69 |
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
274 |
@ 16:89ea3eee2d69 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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
344 |
working directory is now at 171614c9a791 |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
345 |
|
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
346 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
347 |
@ 8:171614c9a791 added b |
3804
509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3802
diff
changeset
|
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
365 |
# Node ID 171614c9a7914c53f531373b95632323fdbbac8d |
3805
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 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
369 |
diff -r c7586e2a9264 -r 171614c9a791 b |
3805
2410e7063692
evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3804
diff
changeset
|
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 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
379 |
atop:[8] added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
380 |
move:[4] added d |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
381 |
working directory is now at 4ae4427ee9f8 |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
382 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
383 |
@ 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
384 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
385 |
o 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
386 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
387 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
388 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
389 |
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
|
390 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
391 |
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
|
392 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
393 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
394 |
More testing! |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
395 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
396 |
$ hg up .^^ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
397 |
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
|
398 |
$ echo x > x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
399 |
$ 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
|
400 |
$ hg glog -r . |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
401 |
@ 11:71a392c714b5 added x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
402 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
403 |
~ |
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 |
$ echo foo > x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
406 |
$ hg branch bar |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
407 |
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
|
408 |
(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
|
409 |
$ 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
|
410 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
411 |
$ hg up 71a392c714b5 --hidden |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
412 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
413 |
updated to hidden changeset 71a392c714b5 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
414 |
(hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
415 |
working directory parent is obsolete! (71a392c714b5) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
416 |
(use 'hg evolve' to update to its successor: 1e1a50385a7d) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
417 |
$ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
418 |
rebasing 11:71a392c714b5 "added x" |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
419 |
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
|
420 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
421 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
422 |
@ 13:1e4f6b3bb39b added x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
423 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
424 |
| * 12:1e1a50385a7d added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
425 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
426 |
o | 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
427 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
428 |
o | 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
429 |
|/ () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
430 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
431 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
432 |
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
|
433 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
434 |
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
|
435 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
436 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
437 |
$ hg evolve --content-divergent |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
438 |
merge:[13] added x |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
439 |
with: [12] added foo to x |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
440 |
base: [11] added x |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
441 |
rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
442 |
updating to "local" side of the conflict: 1e4f6b3bb39b |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
443 |
merging "other" content-divergent changeset '80cc9b1ec650' |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
444 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
445 |
working directory is now at b006cf317e0e |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
446 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
447 |
$ hg exp |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
448 |
# HG changeset patch |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
449 |
# User test |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
450 |
# Date 0 0 |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
451 |
# 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
|
452 |
# Branch bar |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
453 |
# Node ID b006cf317e0ed16dbe786c439577475580f645f1 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
454 |
# Parent 4ae4427ee9f8f0935211fd66360948b77ab5aee9 |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
455 |
added foo to x |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
456 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
457 |
diff -r 4ae4427ee9f8 -r b006cf317e0e x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
458 |
--- /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
|
459 |
+++ 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
|
460 |
@@ -0,0 +1,1 @@ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
461 |
+foo |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
462 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
463 |
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
|
464 |
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
|
465 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
466 |
@ 15:b006cf317e0e added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
467 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
468 |
o 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
469 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
470 |
o 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
471 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
472 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
473 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
474 |
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
|
475 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
476 |
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
|
477 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
478 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
479 |
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
|
480 |
will lead to conflicts |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
481 |
--------------------------------------------------------------------------------- |
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 |
$ hg up .^^^ |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
484 |
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
|
485 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
486 |
$ echo y > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
487 |
$ 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
|
488 |
$ hg glog -r . |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
489 |
@ 16:fc6ad2bac162 added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
490 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
491 |
~ |
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 |
$ echo bar > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
494 |
$ hg amend |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
495 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
496 |
$ hg up fc6ad2bac162 --hidden |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
497 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
498 |
updated to hidden changeset fc6ad2bac162 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
499 |
(hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
500 |
working directory parent is obsolete! (fc6ad2bac162) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
501 |
(use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
502 |
$ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
503 |
rebasing 16:fc6ad2bac162 "added y" |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
504 |
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
|
505 |
$ echo wat > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
506 |
$ hg amend |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
507 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
508 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
509 |
@ 19:b4575ed6fcfc added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
510 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
511 |
| * 17:2a9f6ccbdeba added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
512 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
513 |
o | 15:b006cf317e0e added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
514 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
515 |
o | 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
516 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
517 |
o | 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
518 |
|/ () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
519 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
520 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
521 |
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
|
522 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
523 |
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
|
524 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
525 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
526 |
$ hg evolve --content-divergent |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
527 |
merge:[19] added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
528 |
with: [17] added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
529 |
base: [16] added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
530 |
rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
531 |
updating to "local" side of the conflict: b4575ed6fcfc |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
532 |
merging "other" content-divergent changeset '48f745db3f53' |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
533 |
merging y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
534 |
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
|
535 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
3852
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
536 |
fix conflicts and see `hg help evolve.interrupted` |
629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3850
diff
changeset
|
537 |
[1] |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
538 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
539 |
$ echo watbar > y |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
540 |
$ hg resolve -m |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
541 |
(no more unresolved files) |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
542 |
continue: hg evolve --continue |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
543 |
$ hg evolve --continue |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
544 |
working directory is now at 7bbcf24ddecf |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
545 |
|
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
546 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
547 |
@ 21:7bbcf24ddecf added y |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
548 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
549 |
o 15:b006cf317e0e added foo to x |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
550 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
551 |
o 10:4ae4427ee9f8 added d |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
552 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
553 |
o 9:917281f93fcb added c |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
554 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
555 |
o 8:171614c9a791 added b |
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
556 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
557 |
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
|
558 |
| () [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
559 |
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
|
560 |
() [default] draft |
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
561 |
|
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
562 |
$ hg obslog -r . --all |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
563 |
@ 7bbcf24ddecf (21) added y |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
564 |
|\ |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
565 |
x | 48f745db3f53 (20) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
566 |
| | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
567 |
| | |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
568 |
| x b4575ed6fcfc (19) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
569 |
| | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
570 |
| | |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
571 |
x | 2a9f6ccbdeba (17) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
572 |
| | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
3809
f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3807
diff
changeset
|
573 |
| | |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
574 |
| x 96b677f01b81 (18) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
575 |
|/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
576 |
| |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
577 |
x fc6ad2bac162 (16) added y |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
578 |
rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
579 |
rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
580 |
|
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
581 |
|
3806
99469bb3854e
tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3805
diff
changeset
|
582 |
checking that relocated commit is there |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
583 |
$ hg exp 48f745db3f53 --hidden |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
584 |
# HG changeset patch |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
585 |
# User test |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
586 |
# Date 0 0 |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
587 |
# Thu Jan 01 00:00:00 1970 +0000 |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
588 |
# Node ID 48f745db3f5300363ca248b9aeab20ff2a55fbb3 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
589 |
# Parent b006cf317e0ed16dbe786c439577475580f645f1 |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
590 |
added y |
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
591 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
592 |
diff -r b006cf317e0e -r 48f745db3f53 y |
3807
03ccdc753582
evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3806
diff
changeset
|
593 |
--- /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
|
594 |
+++ 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
|
595 |
@@ -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
|
596 |
+bar |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
597 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
598 |
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
|
599 |
---------------------------------------------------------------------- |
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 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
602 |
@ 21:7bbcf24ddecf added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
603 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
604 |
o 15:b006cf317e0e added foo to x |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
605 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
606 |
o 10:4ae4427ee9f8 added d |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
607 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
608 |
o 9:917281f93fcb added c |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
609 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
610 |
o 8:171614c9a791 added b |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
611 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
612 |
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
|
613 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
614 |
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
|
615 |
() [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
616 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
617 |
$ hg up .^^^^ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
618 |
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
|
619 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
620 |
$ echo z > z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
621 |
$ 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
|
622 |
$ hg glog -r . |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
623 |
@ 22:daf1de08f3b0 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
624 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
625 |
~ |
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 |
$ echo foo > y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
628 |
$ hg add y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
629 |
$ hg amend |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
630 |
|
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
631 |
$ hg up daf1de08f3b0 --hidden |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
632 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
633 |
updated to hidden changeset daf1de08f3b0 |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
634 |
(hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
635 |
working directory parent is obsolete! (daf1de08f3b0) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
636 |
(use 'hg evolve' to update to its successor: 3f7a1f693080) |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
637 |
$ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
638 |
rebasing 22:daf1de08f3b0 "added z" |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
639 |
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
|
640 |
$ echo bar > z |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
641 |
$ hg amend |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
642 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
643 |
$ hg glog |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
644 |
@ 25:53242575ffa9 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
645 |
| () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
646 |
| * 23:3f7a1f693080 added z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
647 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
648 |
o | 21:7bbcf24ddecf added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
649 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
650 |
o | 15:b006cf317e0e added foo to x |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
651 |
| | () [bar] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
652 |
o | 10:4ae4427ee9f8 added d |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
653 |
| | () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
654 |
o | 9:917281f93fcb added c |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
655 |
|/ () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
656 |
o 8:171614c9a791 added b |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
657 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
658 |
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
|
659 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
660 |
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
|
661 |
() [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
662 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
663 |
$ hg evolve --content-divergent |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
664 |
merge:[25] added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
665 |
with: [23] added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
666 |
base: [22] added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
667 |
rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
668 |
merging y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
669 |
warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
3853
796334340cad
evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3852
diff
changeset
|
670 |
fix conflicts and see `hg help evolve.interrupted` |
796334340cad
evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3852
diff
changeset
|
671 |
[1] |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
672 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
673 |
$ hg diff |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
674 |
diff -r 7bbcf24ddecf y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
675 |
--- 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
|
676 |
+++ 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
|
677 |
@@ -1,1 +1,5 @@ |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
678 |
+<<<<<<< destination: 7bbcf24ddecf bar - test: added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
679 |
watbar |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
680 |
+======= |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
681 |
+foo |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
682 |
+>>>>>>> evolving: 3f7a1f693080 - test: added z |
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
683 |
diff -r 7bbcf24ddecf z |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
684 |
--- /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
|
685 |
+++ 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
|
686 |
@@ -0,0 +1,1 @@ |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
687 |
+z |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
688 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
689 |
$ echo foo > y |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
690 |
$ hg resolve -m |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
691 |
(no more unresolved files) |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
692 |
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
|
693 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
694 |
$ hg evolve --continue |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
695 |
evolving 23:3f7a1f693080 "added z" |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
696 |
updating to "local" side of the conflict: 53242575ffa9 |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
697 |
merging "other" content-divergent changeset 'cdb0643c69fc' |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
698 |
merging y |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
699 |
warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
700 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
701 |
fix conflicts and see `hg help evolve.interrupted` |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
702 |
[1] |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
703 |
|
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
704 |
$ hg diff |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
705 |
diff -r 53242575ffa9 y |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
706 |
--- a/y Thu Jan 01 00:00:00 1970 +0000 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
707 |
+++ b/y Thu Jan 01 00:00:00 1970 +0000 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
708 |
@@ -1,1 +1,5 @@ |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
709 |
+<<<<<<< local: 53242575ffa9 bar - test: added z |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
710 |
watbar |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
711 |
+======= |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
712 |
+foo |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
713 |
+>>>>>>> other: cdb0643c69fc - test: added z |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
714 |
|
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
715 |
$ echo foo > y |
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
716 |
$ hg resolve -m |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
717 |
(no more unresolved files) |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
718 |
continue: hg evolve --continue |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
719 |
$ hg evolve --continue |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
720 |
working directory is now at 6fc7d9682de6 |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
721 |
|
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
722 |
$ hg glog |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
723 |
@ 27:6fc7d9682de6 added z |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
724 |
| () [bar] draft |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
725 |
o 21:7bbcf24ddecf added y |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
726 |
| () [bar] draft |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
727 |
o 15:b006cf317e0e added foo to x |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
728 |
| () [bar] draft |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
729 |
o 10:4ae4427ee9f8 added d |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
730 |
| () [default] draft |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
731 |
o 9:917281f93fcb added c |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
732 |
| () [default] draft |
3846
f9dad99a90d5
evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3845
diff
changeset
|
733 |
o 8:171614c9a791 added b |
3810
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
734 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
735 |
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
|
736 |
| () [default] draft |
04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3809
diff
changeset
|
737 |
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
|
738 |
() [default] draft |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
739 |
|
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
740 |
$ hg exp |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
741 |
# HG changeset patch |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
742 |
# User test |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
743 |
# Date 0 0 |
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
744 |
# Thu Jan 01 00:00:00 1970 +0000 |
3881
9cf45b94f977
evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3853
diff
changeset
|
745 |
# Branch bar |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
746 |
# Node ID 6fc7d9682de6e3bee6c8b1266b756ed7d522b7e4 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
747 |
# Parent 7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
748 |
added z |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
749 |
|
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
750 |
diff -r 7bbcf24ddecf -r 6fc7d9682de6 y |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
751 |
--- a/y Thu Jan 01 00:00:00 1970 +0000 |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
752 |
+++ b/y Thu Jan 01 00:00:00 1970 +0000 |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
753 |
@@ -1,1 +1,1 @@ |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
754 |
-watbar |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
755 |
+foo |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
756 |
diff -r 7bbcf24ddecf -r 6fc7d9682de6 z |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
757 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
758 |
+++ b/z Thu Jan 01 00:00:00 1970 +0000 |
3811
3273b178c202
evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3810
diff
changeset
|
759 |
@@ -0,0 +1,1 @@ |
3882
55b8c7e7e352
compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3881
diff
changeset
|
760 |
+bar |
3844
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 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
764 |
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
|
765 |
--------------------------------------------------------- |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
766 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
767 |
$ hg init stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
768 |
$ cd stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
769 |
$ echo ".*\.orig" > .hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
770 |
$ hg add .hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
771 |
$ hg ci -m "added hgignore" |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
772 |
$ 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
|
773 |
|
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 |
@ 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 |
$ cd .. |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
787 |
$ hg init stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
788 |
$ cd stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
789 |
$ hg pull ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
790 |
pulling from ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
791 |
requesting all changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
792 |
adding changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
793 |
adding manifests |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
794 |
adding file changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
795 |
added 5 changesets with 5 changes to 5 files |
4197
1dd5c6e6cd53
test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
796 |
new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
797 |
(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
|
798 |
$ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
799 |
o 4:c41c793e0ef1 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
800 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
801 |
o 3:ca1b80f7960a added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
802 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
803 |
o 2:b1661037fa25 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
804 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
805 |
o 1:c7586e2a9264 added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
806 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
807 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
808 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
809 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
810 |
$ hg up c7586e2a9264 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
811 |
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
|
812 |
$ echo bar > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
813 |
$ 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
|
814 |
3 new orphan changesets |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
815 |
$ echo wat > a |
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
816 |
$ hg amend -m "watbar to a" |
3844
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 |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
819 |
atop:[6] watbar to a |
3844
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 |
move:[4] added d |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
822 |
working directory is now at 15c781f93cac |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
823 |
$ hg glog |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
824 |
@ 9:15c781f93cac added d |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
825 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
826 |
o 8:9e5fb1d5b955 added c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
827 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
828 |
o 7:88516dccf68a added b |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
829 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
830 |
o 6:82b74d5dc678 watbar to a |
3844
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 0:8fa14d15e168 added hgignore |
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 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
835 |
$ cd ../stacktest |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
836 |
$ hg up .^^^ |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
837 |
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
|
838 |
$ echo wat > a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
839 |
$ 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
|
840 |
3 new orphan changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
841 |
$ hg evolve --all |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
842 |
move:[2] added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
843 |
atop:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
844 |
move:[3] added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
845 |
move:[4] added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
846 |
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
|
847 |
$ hg glog |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
848 |
@ 8:c72d2885eb51 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
849 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
850 |
o 7:3ce4be6d8e5e added c |
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 |
o 6:d5f148423c16 added b |
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 |
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
|
855 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
856 |
o 0:8fa14d15e168 added hgignore |
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 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
859 |
$ hg pull ../stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
860 |
pulling from ../stack2 |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
861 |
searching for changes |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
862 |
adding changesets |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
863 |
adding manifests |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
864 |
adding file changes |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
865 |
added 4 changesets with 0 changes to 4 files (+1 heads) |
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
866 |
5 new obsolescence markers |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
867 |
8 new content-divergent changesets |
4197
1dd5c6e6cd53
test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
868 |
new changesets 82b74d5dc678:15c781f93cac (4 drafts) |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
869 |
(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
|
870 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
871 |
$ hg glog |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
872 |
* 12:15c781f93cac added d |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
873 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
874 |
* 11:9e5fb1d5b955 added c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
875 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
876 |
* 10:88516dccf68a added b |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
877 |
| () [default] draft |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
878 |
* 9:82b74d5dc678 watbar to a |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
879 |
| () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
880 |
| @ 8:c72d2885eb51 added d |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
881 |
| | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
882 |
| * 7:3ce4be6d8e5e added c |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
883 |
| | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
884 |
| * 6:d5f148423c16 added b |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
885 |
| | () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
886 |
| * 5:8e222f257bbf watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
887 |
|/ () [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
888 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
889 |
() [default] draft |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
890 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
891 |
$ hg evolve --all --content-divergent |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
892 |
merge:[5] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
893 |
with: [9] watbar to a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
894 |
base: [1] added a |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
895 |
updating to "local" side of the conflict: 8e222f257bbf |
3849
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
896 |
merging "other" content-divergent changeset '82b74d5dc678' |
a17d4934c5ce
tests: fix a test case to not create conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3846
diff
changeset
|
897 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
898 |
6 new orphan changesets |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
899 |
merge:[6] added b |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
900 |
with: [10] added b |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
901 |
base: [2] added b |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
902 |
updating to "local" side of the conflict: d5f148423c16 |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
903 |
merging "other" content-divergent changeset '88516dccf68a' |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
904 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
905 |
merge:[7] added c |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
906 |
with: [11] added c |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
907 |
base: [3] added c |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
908 |
updating to "local" side of the conflict: 3ce4be6d8e5e |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
909 |
merging "other" content-divergent changeset '9e5fb1d5b955' |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
910 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
911 |
merge:[8] added d |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
912 |
with: [12] added d |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
913 |
base: [4] added d |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
914 |
updating to "local" side of the conflict: c72d2885eb51 |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
915 |
merging "other" content-divergent changeset '15c781f93cac' |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
916 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
917 |
working directory is now at 038fe7db3d88 |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
918 |
|
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
919 |
$ hg glog |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
920 |
@ 16:038fe7db3d88 added d |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
921 |
| () [default] draft |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
922 |
o 15:b2cac10f3836 added c |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
923 |
| () [default] draft |
3850
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
924 |
o 14:eadfd9d70680 added b |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
925 |
| () [default] draft |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
926 |
o 13:f66f262fff6c watbar to a |
340cf6fbe9e9
evolve: create resolved cset on successors of current parents
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3849
diff
changeset
|
927 |
| () [default] draft |
3844
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
928 |
o 0:8fa14d15e168 added hgignore |
48fbccfd1dff
tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3842
diff
changeset
|
929 |
() [default] draft |