author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 24 Apr 2019 14:38:26 +0200 | |
changeset 4574 | 5e8c47c553db |
parent 4530 | d081cc4f5fef |
child 4576 | 96ce1030d2fb |
permissions | -rw-r--r-- |
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
1 |
=============================================================== |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
2 |
Tests the resolution of public content divergence: corner cases |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
3 |
=============================================================== |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
4 |
|
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
5 |
This file intend to cover cases that are specific enough to not fit in the |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
6 |
other cases. |
4383
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
7 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
8 |
Setup |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
9 |
===== |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
10 |
$ cat >> $HGRCPATH <<EOF |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
11 |
> [alias] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
12 |
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {troubles}\n\n" |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
13 |
> [phases] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
14 |
> publish = False |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
15 |
> [extensions] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
16 |
> rebase = |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
17 |
> EOF |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
18 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
19 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
20 |
Testing when divergence is not created by actual diff change, but because of rebasing: |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
21 |
-------------------------------------------------------------------------------------- |
4385
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
22 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
23 |
Prepare the repo: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
24 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
25 |
$ hg init rebasediv |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
26 |
$ cd rebasediv |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
27 |
$ for ch in a b c; do |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
28 |
> echo $ch > $ch; |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
29 |
> hg ci -Am "added "$ch; |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
30 |
> done; |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
31 |
adding a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
32 |
adding b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
33 |
adding c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
34 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
35 |
$ hg glog |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
36 |
@ 2:155349b645be added c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
37 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
38 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
39 |
o 1:5f6d8a4bf34a added b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
40 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
41 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
42 |
o 0:9092f1db7931 added a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
43 |
draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
44 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
45 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
46 |
On server side: a new cset is added based on rev 1 and rev 2 is rebased on newly added cset: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
47 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
48 |
$ hg up .^ -q |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
49 |
$ echo d > d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
50 |
$ hg ci -Am "added d" |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
51 |
adding d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
52 |
created new head |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
53 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
54 |
$ hg rebase -r 2 -d . |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
55 |
rebasing 2:155349b645be "added c" |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
56 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
57 |
$ hg glog |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
58 |
o 4:c0d7ee6604ea added c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
59 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
60 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
61 |
@ 3:c9241b0f2d5b added d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
62 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
63 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
64 |
o 1:5f6d8a4bf34a added b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
65 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
66 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
67 |
o 0:9092f1db7931 added a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
68 |
draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
69 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
70 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
71 |
On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
72 |
$ hg up 2 --hidden -q |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
73 |
updated to hidden changeset 155349b645be |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
74 |
(hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
75 |
working directory parent is obsolete! (155349b645be) |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
76 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
77 |
$ echo cc >> c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
78 |
$ hg ci --amend -m "updated c" |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
79 |
2 new content-divergent changesets |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
80 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
81 |
Lets change the phase to --public of branch which is pulled from server: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
82 |
$ hg phase --public -r 4 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
83 |
$ hg glog -p |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
84 |
@ 5:f5f9b4fc8b77 updated c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
85 |
| draft content-divergent |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
86 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
87 |
| diff -r 5f6d8a4bf34a -r f5f9b4fc8b77 c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
88 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
89 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
90 |
| @@ -0,0 +1,2 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
91 |
| +c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
92 |
| +cc |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
93 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
94 |
| o 4:c0d7ee6604ea added c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
95 |
| | public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
96 |
| | |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
97 |
| | diff -r c9241b0f2d5b -r c0d7ee6604ea c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
98 |
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
99 |
| | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
100 |
| | @@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
101 |
| | +c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
102 |
| | |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
103 |
| o 3:c9241b0f2d5b added d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
104 |
|/ public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
105 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
106 |
| diff -r 5f6d8a4bf34a -r c9241b0f2d5b d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
107 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
108 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
109 |
| @@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
110 |
| +d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
111 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
112 |
o 1:5f6d8a4bf34a added b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
113 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
114 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
115 |
| diff -r 9092f1db7931 -r 5f6d8a4bf34a b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
116 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
117 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
118 |
| @@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
119 |
| +b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
120 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
121 |
o 0:9092f1db7931 added a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
122 |
public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
123 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
124 |
diff -r 000000000000 -r 9092f1db7931 a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
125 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
126 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
127 |
@@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
128 |
+a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
129 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
130 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
131 |
Evolve: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
132 |
$ hg evolve --content-divergent |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
133 |
merge:[4] added c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
134 |
with: [5] updated c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
135 |
base: [2] added c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
136 |
rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
137 |
updating to "local" side of the conflict: c0d7ee6604ea |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
138 |
merging "other" content-divergent changeset 'c3d442d80993' |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
139 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
140 |
committed as 3b336cbee992 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
141 |
working directory is now at 3b336cbee992 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
142 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
143 |
$ hg glog -p |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
144 |
@ 8:3b336cbee992 phase-divergent update to c0d7ee6604ea: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
145 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
146 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
147 |
| diff -r c0d7ee6604ea -r 3b336cbee992 c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
148 |
| --- a/c Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
149 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
150 |
| @@ -1,1 +1,2 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
151 |
| c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
152 |
| +cc |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
153 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
154 |
o 4:c0d7ee6604ea added c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
155 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
156 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
157 |
| diff -r c9241b0f2d5b -r c0d7ee6604ea c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
158 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
159 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
160 |
| @@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
161 |
| +c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
162 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
163 |
o 3:c9241b0f2d5b added d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
164 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
165 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
166 |
| diff -r 5f6d8a4bf34a -r c9241b0f2d5b d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
167 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
168 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
169 |
| @@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
170 |
| +d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
171 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
172 |
o 1:5f6d8a4bf34a added b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
173 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
174 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
175 |
| diff -r 9092f1db7931 -r 5f6d8a4bf34a b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
176 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
177 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
178 |
| @@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
179 |
| +b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
180 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
181 |
o 0:9092f1db7931 added a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
182 |
public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
183 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
184 |
diff -r 000000000000 -r 9092f1db7931 a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
185 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
186 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
187 |
@@ -0,0 +1,1 @@ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
188 |
+a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
189 |
|
4471
3caa4a459439
tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4454
diff
changeset
|
190 |
Check that we don't have any unstable cset now: |
4385
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
191 |
$ hg evolve -l |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
192 |
$ cd .. |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
193 |
|
4473
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
194 |
Different parent, simple conflict on relocate, deleted file on actual merge |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
195 |
--------------------------------------------------------------------------- |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
196 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
197 |
Changeset "added c e" is also removing 'd'. This should conflict with the update |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
198 |
to 'd' in the successors of 'adding d' when solving the content divergence. |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
199 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
200 |
$ hg init pubdiv-parent-deleted-file |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
201 |
$ cd pubdiv-parent-deleted-file |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
202 |
$ for ch in a b c d; do |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
203 |
> echo $ch > $ch; |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
204 |
> hg ci -Aqm "added "$ch; |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
205 |
> done; |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
206 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
207 |
$ hg up 'desc("added b")' |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
208 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
209 |
$ echo cfoo > c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
210 |
$ echo e > e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
211 |
$ hg add c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
212 |
$ hg ci -m "added c e" |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
213 |
created new head |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
214 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
215 |
$ hg up 'desc("re:added c$")' |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
216 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
217 |
$ echo dd > d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
218 |
$ hg add d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
219 |
$ hg ci -m "added d" |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
220 |
created new head |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
221 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
222 |
$ hg glog --patch --rev 'sort(all(), "topo")' |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
223 |
@ 5:93cd84bbdaca added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
224 |
| draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
225 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
226 |
| diff -r 155349b645be -r 93cd84bbdaca d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
227 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
228 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
229 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
230 |
| +dd |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
231 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
232 |
| o 3:9150fe93bec6 added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
233 |
|/ draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
234 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
235 |
| diff -r 155349b645be -r 9150fe93bec6 d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
236 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
237 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
238 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
239 |
| +d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
240 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
241 |
o 2:155349b645be added c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
242 |
| draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
243 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
244 |
| diff -r 5f6d8a4bf34a -r 155349b645be c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
245 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
246 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
247 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
248 |
| +c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
249 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
250 |
| o 4:e568fd1029bb added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
251 |
|/ draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
252 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
253 |
| diff -r 5f6d8a4bf34a -r e568fd1029bb c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
254 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
255 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
256 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
257 |
| +cfoo |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
258 |
| diff -r 5f6d8a4bf34a -r e568fd1029bb e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
259 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
260 |
| +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
261 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
262 |
| +e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
263 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
264 |
o 1:5f6d8a4bf34a added b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
265 |
| draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
266 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
267 |
| diff -r 9092f1db7931 -r 5f6d8a4bf34a b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
268 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
269 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
270 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
271 |
| +b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
272 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
273 |
o 0:9092f1db7931 added a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
274 |
draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
275 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
276 |
diff -r 000000000000 -r 9092f1db7931 a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
277 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
278 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
279 |
@@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
280 |
+a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
281 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
282 |
$ hg prune 'min(desc("added d"))' -s 'max(desc("added d"))' |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
283 |
1 changesets pruned |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
284 |
$ hg prune 'min(desc("added d"))' -s 'desc("added c e")' --hidden |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
285 |
1 changesets pruned |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
286 |
2 new content-divergent changesets |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
287 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
288 |
Change phase to public for one head: |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
289 |
$ hg phase --public -r 'max(desc("added d"))' |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
290 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
291 |
$ hg glog |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
292 |
@ 5:93cd84bbdaca added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
293 |
| public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
294 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
295 |
| * 4:e568fd1029bb added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
296 |
| | draft content-divergent |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
297 |
| | |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
298 |
o | 2:155349b645be added c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
299 |
|/ public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
300 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
301 |
o 1:5f6d8a4bf34a added b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
302 |
| public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
303 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
304 |
o 0:9092f1db7931 added a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
305 |
public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
306 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
307 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
308 |
$ hg glog --patch --rev 'sort(all(), "topo")' --hidden |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
309 |
@ 5:93cd84bbdaca added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
310 |
| public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
311 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
312 |
| diff -r 155349b645be -r 93cd84bbdaca d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
313 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
314 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
315 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
316 |
| +dd |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
317 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
318 |
| x 3:9150fe93bec6 added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
319 |
|/ draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
320 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
321 |
| diff -r 155349b645be -r 9150fe93bec6 d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
322 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
323 |
| +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
324 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
325 |
| +d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
326 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
327 |
o 2:155349b645be added c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
328 |
| public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
329 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
330 |
| diff -r 5f6d8a4bf34a -r 155349b645be c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
331 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
332 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
333 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
334 |
| +c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
335 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
336 |
| * 4:e568fd1029bb added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
337 |
|/ draft content-divergent |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
338 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
339 |
| diff -r 5f6d8a4bf34a -r e568fd1029bb c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
340 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
341 |
| +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
342 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
343 |
| +cfoo |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
344 |
| diff -r 5f6d8a4bf34a -r e568fd1029bb e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
345 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
346 |
| +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
347 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
348 |
| +e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
349 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
350 |
o 1:5f6d8a4bf34a added b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
351 |
| public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
352 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
353 |
| diff -r 9092f1db7931 -r 5f6d8a4bf34a b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
354 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
355 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
356 |
| @@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
357 |
| +b |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
358 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
359 |
o 0:9092f1db7931 added a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
360 |
public |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
361 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
362 |
diff -r 000000000000 -r 9092f1db7931 a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
363 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
364 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
365 |
@@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
366 |
+a |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
367 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
368 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
369 |
$ hg obslog --all --rev tip --patch |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
370 |
@ 93cd84bbdaca (5) added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
371 |
| |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
372 |
| * e568fd1029bb (4) added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
373 |
|/ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
374 |
x 9150fe93bec6 (3) added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
375 |
rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
376 |
diff -r 9150fe93bec6 -r 93cd84bbdaca d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
377 |
--- a/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
378 |
+++ b/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
379 |
@@ -1,1 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
380 |
-d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
381 |
+dd |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
382 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
383 |
rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
384 |
(No patch available, changesets rebased) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
385 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
386 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
387 |
$ hg evolve --content-divergent --any |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
388 |
merge:[5] added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
389 |
with: [4] added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
390 |
base: [3] added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
391 |
rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
392 |
merging c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
393 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
394 |
fix conflicts and see `hg help evolve.interrupted` |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
395 |
[1] |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
396 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
397 |
$ hg diff |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
398 |
diff -r 155349b645be c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
399 |
--- a/c Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
400 |
+++ b/c Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
401 |
@@ -1,1 +1,5 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
402 |
+<<<<<<< destination: 155349b645be - test: added c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
403 |
c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
404 |
+======= |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
405 |
+cfoo |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
406 |
+>>>>>>> evolving: e568fd1029bb - test: added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
407 |
diff -r 155349b645be e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
408 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
409 |
+++ b/e Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
410 |
@@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
411 |
+e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
412 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
413 |
$ echo c > c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
414 |
$ hg res -m |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
415 |
(no more unresolved files) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
416 |
continue: hg evolve --continue |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
417 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
418 |
$ hg evolve --continue |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
419 |
evolving 4:e568fd1029bb "added c e" |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
420 |
updating to "local" side of the conflict: 93cd84bbdaca |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
421 |
merging "other" content-divergent changeset '2af3359250d3' |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
422 |
file 'd' was deleted in other but was modified in local. |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
423 |
What do you want to do? |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
424 |
use (c)hanged version, (d)elete, or leave (u)nresolved? u |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
425 |
1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
426 |
fix conflicts and see `hg help evolve.interrupted` |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
427 |
[1] |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
428 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
429 |
$ hg sum |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
430 |
parent: 5:93cd84bbdaca |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
431 |
added d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
432 |
parent: 6:2af3359250d3 tip (content-divergent) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
433 |
added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
434 |
branch: default |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
435 |
commit: 1 modified, 1 unknown, 1 unresolved (merge) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
436 |
update: (current) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
437 |
phases: 1 draft |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
438 |
content-divergent: 1 changesets |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
439 |
evolve: (evolve --continue) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
440 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
441 |
$ echo resolved > d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
442 |
$ hg resolve -m d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
443 |
(no more unresolved files) |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
444 |
continue: hg evolve --continue |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
445 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
446 |
$ hg evolve --continue |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
447 |
committed as bc1f4610744c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
448 |
working directory is now at bc1f4610744c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
449 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
450 |
$ hg export |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
451 |
# HG changeset patch |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
452 |
# User test |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
453 |
# Date 0 0 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
454 |
# Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
455 |
# Node ID bc1f4610744c6aa0e851d3876a61bfff6243b31c |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
456 |
# Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
457 |
phase-divergent update to 93cd84bbdaca: |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
458 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
459 |
added c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
460 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
461 |
diff -r 93cd84bbdaca -r bc1f4610744c d |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
462 |
--- a/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
463 |
+++ b/d Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
464 |
@@ -1,1 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
465 |
-dd |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
466 |
+resolved |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
467 |
diff -r 93cd84bbdaca -r bc1f4610744c e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
468 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
469 |
+++ b/e Thu Jan 01 00:00:00 1970 +0000 |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
470 |
@@ -0,0 +1,1 @@ |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
471 |
+e |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
472 |
|
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
473 |
$ hg evolve -l |
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
474 |
$ cd .. |
4416
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
475 |
|
4444
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
476 |
Test a pratical "rebase" case |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
477 |
============================= |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
478 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
479 |
Initial setup |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
480 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
481 |
$ hg init rebase-divergence |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
482 |
$ cd rebase-divergence |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
483 |
$ echo root >> root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
484 |
$ hg add root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
485 |
$ hg commit -m root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
486 |
$ for x in c_A c_B c_C c_D; do |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
487 |
> echo $x >> $x |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
488 |
> hg add $x |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
489 |
> hg commit -m $x |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
490 |
> done |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
491 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
492 |
$ hg up 'desc("c_A")' |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
493 |
0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
494 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
495 |
$ for x in c_E c_F; do |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
496 |
> echo $x >> $x |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
497 |
> hg add $x |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
498 |
> hg commit -m $x |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
499 |
> done |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
500 |
created new head |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
501 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
502 |
(creating divergence locally for simplicity) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
503 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
504 |
$ node=`hg log --rev 'desc("c_E")' -T '{node}'` |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
505 |
$ hg rebase -s $node -d 'desc("c_B")' |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
506 |
rebasing 5:4ab2719bbab9 "c_E" |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
507 |
rebasing 6:77ccbf8d837e "c_F" (tip) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
508 |
$ hg phase --public tip |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
509 |
$ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
510 |
rebasing 5:4ab2719bbab9 "c_E" |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
511 |
rebasing 6:77ccbf8d837e "c_F" |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
512 |
2 new content-divergent changesets |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
513 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
514 |
$ hg sum |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
515 |
parent: 8:a52ac76b45f5 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
516 |
c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
517 |
branch: default |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
518 |
commit: (clean) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
519 |
update: 4 new changesets, 3 branch heads (merge) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
520 |
phases: 4 draft |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
521 |
content-divergent: 2 changesets |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
522 |
$ hg evolve --list |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
523 |
b4a584aea4bd: c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
524 |
content-divergent: c7d2d47c7240 (public) (precursor 4ab2719bbab9) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
525 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
526 |
8ae8db670b4a: c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
527 |
content-divergent: a52ac76b45f5 (public) (precursor 77ccbf8d837e) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
528 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
529 |
$ hg log -G --patch |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
530 |
* changeset: 10:8ae8db670b4a |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
531 |
| tag: tip |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
532 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
533 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
534 |
| instability: content-divergent |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
535 |
| summary: c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
536 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
537 |
| diff -r b4a584aea4bd -r 8ae8db670b4a c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
538 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
539 |
| +++ b/c_F Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
540 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
541 |
| +c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
542 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
543 |
* changeset: 9:b4a584aea4bd |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
544 |
| parent: 3:abb77b893f28 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
545 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
546 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
547 |
| instability: content-divergent |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
548 |
| summary: c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
549 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
550 |
| diff -r abb77b893f28 -r b4a584aea4bd c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
551 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
552 |
| +++ b/c_E Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
553 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
554 |
| +c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
555 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
556 |
| @ changeset: 8:a52ac76b45f5 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
557 |
| | user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
558 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
559 |
| | summary: c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
560 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
561 |
| | diff -r c7d2d47c7240 -r a52ac76b45f5 c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
562 |
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
563 |
| | +++ b/c_F Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
564 |
| | @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
565 |
| | +c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
566 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
567 |
| o changeset: 7:c7d2d47c7240 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
568 |
| | parent: 2:eb1b4e1205b8 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
569 |
| | user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
570 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
571 |
| | summary: c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
572 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
573 |
| | diff -r eb1b4e1205b8 -r c7d2d47c7240 c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
574 |
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
575 |
| | +++ b/c_E Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
576 |
| | @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
577 |
| | +c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
578 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
579 |
+---o changeset: 4:dbb960d6c97c |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
580 |
| | user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
581 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
582 |
| | summary: c_D |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
583 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
584 |
| | diff -r abb77b893f28 -r dbb960d6c97c c_D |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
585 |
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
586 |
| | +++ b/c_D Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
587 |
| | @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
588 |
| | +c_D |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
589 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
590 |
o | changeset: 3:abb77b893f28 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
591 |
|/ user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
592 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
593 |
| summary: c_C |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
594 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
595 |
| diff -r eb1b4e1205b8 -r abb77b893f28 c_C |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
596 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
597 |
| +++ b/c_C Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
598 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
599 |
| +c_C |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
600 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
601 |
o changeset: 2:eb1b4e1205b8 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
602 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
603 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
604 |
| summary: c_B |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
605 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
606 |
| diff -r e31751786014 -r eb1b4e1205b8 c_B |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
607 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
608 |
| +++ b/c_B Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
609 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
610 |
| +c_B |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
611 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
612 |
o changeset: 1:e31751786014 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
613 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
614 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
615 |
| summary: c_A |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
616 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
617 |
| diff -r 1e4be0697311 -r e31751786014 c_A |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
618 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
619 |
| +++ b/c_A Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
620 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
621 |
| +c_A |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
622 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
623 |
o changeset: 0:1e4be0697311 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
624 |
user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
625 |
date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
626 |
summary: root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
627 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
628 |
diff -r 000000000000 -r 1e4be0697311 root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
629 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
630 |
+++ b/root Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
631 |
@@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
632 |
+root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
633 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
634 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
635 |
Run automatic evolution |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
636 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
637 |
$ hg evolve --content-divergent --rev 'not public() and desc("c_E")::' |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
638 |
merge:[7] c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
639 |
with: [9] c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
640 |
base: [5] c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
641 |
rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
642 |
updating to "local" side of the conflict: c7d2d47c7240 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
643 |
merging "other" content-divergent changeset '0773642cfa95' |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
644 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
645 |
1 new orphan changesets |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
646 |
merge:[8] c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
647 |
with: [10] c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
648 |
base: [6] c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
649 |
rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
650 |
updating to "local" side of the conflict: a52ac76b45f5 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
651 |
merging "other" content-divergent changeset '6a87ed4aa317' |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
652 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
653 |
$ hg sum |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
654 |
parent: 8:a52ac76b45f5 tip |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
655 |
c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
656 |
branch: default |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
657 |
commit: (clean) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
658 |
update: 2 new changesets, 2 branch heads (merge) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
659 |
phases: 2 draft |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
660 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
661 |
$ hg evolve --list |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
662 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
663 |
$ hg log -G --patch |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
664 |
@ changeset: 8:a52ac76b45f5 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
665 |
| tag: tip |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
666 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
667 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
668 |
| summary: c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
669 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
670 |
| diff -r c7d2d47c7240 -r a52ac76b45f5 c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
671 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
672 |
| +++ b/c_F Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
673 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
674 |
| +c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
675 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
676 |
o changeset: 7:c7d2d47c7240 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
677 |
| parent: 2:eb1b4e1205b8 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
678 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
679 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
680 |
| summary: c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
681 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
682 |
| diff -r eb1b4e1205b8 -r c7d2d47c7240 c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
683 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
684 |
| +++ b/c_E Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
685 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
686 |
| +c_E |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
687 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
688 |
| o changeset: 4:dbb960d6c97c |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
689 |
| | user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
690 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
691 |
| | summary: c_D |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
692 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
693 |
| | diff -r abb77b893f28 -r dbb960d6c97c c_D |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
694 |
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
695 |
| | +++ b/c_D Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
696 |
| | @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
697 |
| | +c_D |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
698 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
699 |
| o changeset: 3:abb77b893f28 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
700 |
|/ user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
701 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
702 |
| summary: c_C |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
703 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
704 |
| diff -r eb1b4e1205b8 -r abb77b893f28 c_C |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
705 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
706 |
| +++ b/c_C Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
707 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
708 |
| +c_C |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
709 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
710 |
o changeset: 2:eb1b4e1205b8 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
711 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
712 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
713 |
| summary: c_B |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
714 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
715 |
| diff -r e31751786014 -r eb1b4e1205b8 c_B |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
716 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
717 |
| +++ b/c_B Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
718 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
719 |
| +c_B |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
720 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
721 |
o changeset: 1:e31751786014 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
722 |
| user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
723 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
724 |
| summary: c_A |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
725 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
726 |
| diff -r 1e4be0697311 -r e31751786014 c_A |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
727 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
728 |
| +++ b/c_A Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
729 |
| @@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
730 |
| +c_A |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
731 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
732 |
o changeset: 0:1e4be0697311 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
733 |
user: test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
734 |
date: Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
735 |
summary: root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
736 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
737 |
diff -r 000000000000 -r 1e4be0697311 root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
738 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
739 |
+++ b/root Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
740 |
@@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
741 |
+root |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
742 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
743 |
$ hg export tip |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
744 |
# HG changeset patch |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
745 |
# User test |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
746 |
# Date 0 0 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
747 |
# Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
748 |
# Node ID a52ac76b45f523a039fc4a938d79874f4bdb1a85 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
749 |
# Parent c7d2d47c7240562be5cbd1a24080dd0396178709 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
750 |
c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
751 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
752 |
diff -r c7d2d47c7240 -r a52ac76b45f5 c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
753 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
754 |
+++ b/c_F Thu Jan 01 00:00:00 1970 +0000 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
755 |
@@ -0,0 +1,1 @@ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
756 |
+c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
757 |
|
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
758 |
$ hg obslog --rev a52ac76b45f5 |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
759 |
@ a52ac76b45f5 (8) c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
760 |
|\ |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
761 |
x | 6a87ed4aa317 (12) c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
762 |
| | rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
763 |
| | |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
764 |
x | 8ae8db670b4a (10) c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
765 |
|/ rewritten(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
766 |
| |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
767 |
x 77ccbf8d837e (6) c_F |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
768 |
rewritten(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
769 |
rewritten(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
ea336a6592cc
evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4438
diff
changeset
|
770 |
|