author | Sushil khanchi <sushilkhanchi97@gmail.com> |
Thu, 28 Feb 2019 03:12:39 +0530 | |
changeset 4417 | b86413cfca4a |
parent 4416 | b2a8e67b0933 |
child 4418 | 0ec30a7d9e12 |
permissions | -rw-r--r-- |
4383
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
1 |
Test for handling of content divergence with public cset using `hg evolve` |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
2 |
========================================================================== |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
3 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
4 |
Setup |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
5 |
===== |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
6 |
$ cat >> $HGRCPATH <<EOF |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
7 |
> [alias] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
8 |
> 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
|
9 |
> [phases] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
10 |
> publish = False |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
11 |
> [extensions] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
12 |
> rebase = |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
13 |
> EOF |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
14 |
$ 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
|
15 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
16 |
Testing the case when both divergent cset are on the same parent and no-conflict in merging: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
17 |
------------------------------------------------------------------------------------- |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
18 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
19 |
Prepare the repository: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
20 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
21 |
$ hg init pubdiv |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
22 |
$ cd pubdiv |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
23 |
$ for ch in a b; do |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
24 |
> echo $ch > $ch; |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
25 |
> hg ci -Aqm "added "$ch; |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
26 |
> done; |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
27 |
$ hg glog |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
28 |
@ 1:5f6d8a4bf34a added b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
29 |
| draft |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
30 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
31 |
o 0:9092f1db7931 added a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
32 |
draft |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
33 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
34 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
35 |
Make an amend and change phase to public: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
36 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
37 |
$ sed -i "1 i I am first" b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
38 |
$ hg amend |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
39 |
$ hg phase --public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
40 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
41 |
Amend again to create a cset divergent to public one: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
42 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
43 |
$ hg up 1 --hidden -q |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
44 |
updated to hidden changeset 5f6d8a4bf34a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
45 |
(hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
46 |
working directory parent is obsolete! (5f6d8a4bf34a) |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
47 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
48 |
$ echo "I am second" >> b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
49 |
$ hg ci --amend -m "updated b" |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
50 |
1 new content-divergent changesets |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
51 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
52 |
$ hg glog |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
53 |
@ 3:dcdaf152280a updated b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
54 |
| draft content-divergent |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
55 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
56 |
| o 2:44f360db368f added b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
57 |
|/ public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
58 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
59 |
o 0:9092f1db7931 added a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
60 |
public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
61 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
62 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
63 |
Lets resolve the public content-divergence: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
64 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
65 |
$ hg evolve --content-divergent |
4413
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
66 |
merge:[2] added b |
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
67 |
with: [3] updated b |
4383
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
68 |
base: [1] added b |
4413
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
69 |
updating to "local" side of the conflict: 44f360db368f |
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
70 |
merging "other" content-divergent changeset 'dcdaf152280a' |
4383
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
71 |
merging b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
72 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
73 |
computing new diff |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
74 |
committed as c1aa9cfb6cf8 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
75 |
working directory is now at c1aa9cfb6cf8 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
76 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
77 |
Following graph log shows that it correctly merged the two divergent csets: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
78 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
79 |
$ hg glog -p |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
80 |
@ 5:c1aa9cfb6cf8 phase-divergent update to 44f360db368f: |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
81 |
| draft |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
82 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
83 |
| diff -r 44f360db368f -r c1aa9cfb6cf8 b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
84 |
| --- a/b Thu Jan 01 00:00:00 1970 +0000 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
85 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
86 |
| @@ -1,2 +1,3 @@ |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
87 |
| I am first |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
88 |
| b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
89 |
| +I am second |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
90 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
91 |
o 2:44f360db368f added b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
92 |
| public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
93 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
94 |
| diff -r 9092f1db7931 -r 44f360db368f b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
95 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
96 |
| +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
97 |
| @@ -0,0 +1,2 @@ |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
98 |
| +I am first |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
99 |
| +b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
100 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
101 |
o 0:9092f1db7931 added a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
102 |
public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
103 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
104 |
diff -r 000000000000 -r 9092f1db7931 a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
105 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
106 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
107 |
@@ -0,0 +1,1 @@ |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
108 |
+a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
109 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
110 |
$ hg evolve -l |
4384
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
111 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
112 |
$ cd .. |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
113 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
114 |
Testing the case when both divergent cset has same parent and has conflict in merging: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
115 |
------------------------------------------------------------------------------ |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
116 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
117 |
Prepare the repository: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
118 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
119 |
$ hg init pubdiv1 |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
120 |
$ cd pubdiv1 |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
121 |
$ for ch in a b; do |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
122 |
> echo $ch > $ch; |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
123 |
> hg ci -Aqm "added "$ch; |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
124 |
> done; |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
125 |
$ hg glog |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
126 |
@ 1:5f6d8a4bf34a added b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
127 |
| draft |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
128 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
129 |
o 0:9092f1db7931 added a |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
130 |
draft |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
131 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
132 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
133 |
Make an amend and change phase to public: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
134 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
135 |
$ echo "I am foo" > b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
136 |
$ hg amend |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
137 |
$ hg phase --public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
138 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
139 |
Amend again to create a cset divergent to public one: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
140 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
141 |
$ hg up 1 --hidden -q |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
142 |
updated to hidden changeset 5f6d8a4bf34a |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
143 |
(hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
144 |
working directory parent is obsolete! (5f6d8a4bf34a) |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
145 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
146 |
$ echo "I am bar" > b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
147 |
$ hg ci --amend -m "updated b" |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
148 |
1 new content-divergent changesets |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
149 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
150 |
$ hg glog |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
151 |
@ 3:0e805383168e updated b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
152 |
| draft content-divergent |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
153 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
154 |
| o 2:580f2d01e52c added b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
155 |
|/ public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
156 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
157 |
o 0:9092f1db7931 added a |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
158 |
public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
159 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
160 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
161 |
Lets resolve the divergence: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
162 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
163 |
$ hg evolve --content-divergent |
4413
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
164 |
merge:[2] added b |
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
165 |
with: [3] updated b |
4384
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
166 |
base: [1] added b |
4413
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
167 |
updating to "local" side of the conflict: 580f2d01e52c |
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
168 |
merging "other" content-divergent changeset '0e805383168e' |
4384
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
169 |
merging b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
170 |
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
171 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
172 |
fix conflicts and see `hg help evolve.interrupted` |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
173 |
[1] |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
174 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
175 |
$ echo "I am foobar" > b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
176 |
$ hg resolve -m --tool union |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
177 |
(no more unresolved files) |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
178 |
continue: hg evolve --continue |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
179 |
$ hg evolve --continue |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
180 |
computing new diff |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
181 |
committed as 1a739394e9d4 |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
182 |
working directory is now at 1a739394e9d4 |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
183 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
184 |
$ hg glog |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
185 |
@ 5:1a739394e9d4 phase-divergent update to 580f2d01e52c: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
186 |
| draft |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
187 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
188 |
o 2:580f2d01e52c added b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
189 |
| public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
190 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
191 |
o 0:9092f1db7931 added a |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
192 |
public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
193 |
|
4385
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
194 |
Testing the case when divergence is not created by actual diff change, but because of rebasing: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
195 |
------------------------------------------------------------------------------------------------ |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
196 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
197 |
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
|
198 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
199 |
$ cd .. |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
200 |
$ 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
|
201 |
$ cd rebasediv |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
202 |
$ 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
|
203 |
> 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
|
204 |
> 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
|
205 |
> done; |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
206 |
adding a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
207 |
adding b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
208 |
adding c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
209 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
210 |
$ hg glog |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
211 |
@ 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
|
212 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
213 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
214 |
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
|
215 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
216 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
217 |
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
|
218 |
draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
219 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
220 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
221 |
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
|
222 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
223 |
$ 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
|
224 |
$ 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
|
225 |
$ 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
|
226 |
adding d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
227 |
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
|
228 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
229 |
$ 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
|
230 |
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
|
231 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
232 |
$ hg glog |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
233 |
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
|
234 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
235 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
236 |
@ 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
|
237 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
238 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
239 |
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
|
240 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
241 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
242 |
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
|
243 |
draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
244 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
245 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
246 |
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
|
247 |
$ 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
|
248 |
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
|
249 |
(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
|
250 |
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
|
251 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
252 |
$ 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
|
253 |
$ 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
|
254 |
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
|
255 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
256 |
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
|
257 |
$ 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
|
258 |
$ 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
|
259 |
@ 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
|
260 |
| 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
|
261 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
262 |
| 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
|
263 |
| --- /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
|
264 |
| +++ 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
|
265 |
| @@ -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
|
266 |
| +c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
267 |
| +cc |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
268 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
269 |
| 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
|
270 |
| | public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
271 |
| | |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
272 |
| | 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
|
273 |
| | --- /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
|
274 |
| | +++ 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
|
275 |
| | @@ -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
|
276 |
| | +c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
277 |
| | |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
278 |
| 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
|
279 |
|/ public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
280 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
281 |
| 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
|
282 |
| --- /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
|
283 |
| +++ 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
|
284 |
| @@ -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
|
285 |
| +d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
286 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
287 |
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
|
288 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
289 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
290 |
| 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
|
291 |
| --- /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
|
292 |
| +++ 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
|
293 |
| @@ -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
|
294 |
| +b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
295 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
296 |
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
|
297 |
public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
298 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
299 |
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
|
300 |
--- /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
|
301 |
+++ 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
|
302 |
@@ -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
|
303 |
+a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
304 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
305 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
306 |
Evolve: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
307 |
$ 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
|
308 |
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
|
309 |
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
|
310 |
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
|
311 |
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
|
312 |
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
|
313 |
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
|
314 |
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
|
315 |
computing new diff |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
316 |
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
|
317 |
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
|
318 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
319 |
$ 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
|
320 |
@ 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
|
321 |
| draft |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
322 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
323 |
| 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
|
324 |
| --- 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
|
325 |
| +++ 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
|
326 |
| @@ -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
|
327 |
| c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
328 |
| +cc |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
329 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
330 |
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
|
331 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
332 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
333 |
| 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
|
334 |
| --- /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
|
335 |
| +++ 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
|
336 |
| @@ -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
|
337 |
| +c |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
338 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
339 |
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
|
340 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
341 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
342 |
| 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
|
343 |
| --- /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
|
344 |
| +++ 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
|
345 |
| @@ -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
|
346 |
| +d |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
347 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
348 |
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
|
349 |
| public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
350 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
351 |
| 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
|
352 |
| --- /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
|
353 |
| +++ 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
|
354 |
| @@ -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
|
355 |
| +b |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
356 |
| |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
357 |
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
|
358 |
public |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
359 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
360 |
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
|
361 |
--- /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
|
362 |
+++ 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
|
363 |
@@ -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
|
364 |
+a |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
365 |
|
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
366 |
Check that we don't have any troubled cset now: |
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
367 |
$ hg evolve -l |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
368 |
$ cd .. |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
369 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
370 |
Testing the case when csets are on different parent and no conflict in relocation and merging: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
371 |
---------------------------------------------------------------------------------------------- |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
372 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
373 |
$ hg init pubdiv2 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
374 |
$ cd pubdiv2 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
375 |
$ for ch in a b c d; do |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
376 |
> echo $ch > $ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
377 |
> hg ci -Aqm "added "$ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
378 |
> done; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
379 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
380 |
$ hg up .^ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
381 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
382 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
383 |
$ hg add d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
384 |
$ hg ci -m "added d" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
385 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
386 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
387 |
$ hg up 1 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
388 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
389 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
390 |
$ echo e > e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
391 |
$ hg add d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
392 |
$ hg ci -m "added d e" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
393 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
394 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
395 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
396 |
@ 5:4291d72ee19a added d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
397 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
398 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
399 |
| o 4:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
400 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
401 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
402 |
| | o 3:9150fe93bec6 added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
403 |
| |/ draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
404 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
405 |
| o 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
406 |
|/ draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
407 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
408 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
409 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
410 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
411 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
412 |
draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
413 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
414 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
415 |
$ hg prune 3 -s 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
416 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
417 |
$ hg prune 3 -s 4 --hidden |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
418 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
419 |
2 new content-divergent changesets |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
420 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
421 |
Change phase to public for one head: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
422 |
$ hg phase -r 4 --public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
423 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
424 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
425 |
@ 5:4291d72ee19a added d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
426 |
| draft content-divergent |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
427 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
428 |
| o 4:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
429 |
| | public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
430 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
431 |
| o 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
432 |
|/ public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
433 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
434 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
435 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
436 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
437 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
438 |
public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
439 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
440 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
441 |
$ hg evolve --content-divergent --any |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
442 |
merge:[4] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
443 |
with: [5] added d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
444 |
base: [3] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
445 |
rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
446 |
updating to "local" side of the conflict: 93cd84bbdaca |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
447 |
merging "other" content-divergent changeset 'f88581407163' |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
448 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
449 |
computing new diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
450 |
committed as 4cbe48a0c3d9 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
451 |
working directory is now at 4cbe48a0c3d9 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
452 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
453 |
$ hg glog -l 1 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
454 |
@ 8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
455 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
456 |
~ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
457 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
458 |
$ hg evolve -l |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
459 |
$ cd .. |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
460 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
461 |
Testing the case when csets are on different parent and conflict in relocation but not in merging: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
462 |
-------------------------------------------------------------------------------------------------- |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
463 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
464 |
$ hg init pubdiv3 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
465 |
$ cd pubdiv3 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
466 |
$ for ch in a b c d; do |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
467 |
> echo $ch > $ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
468 |
> hg ci -Aqm "added "$ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
469 |
> done; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
470 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
471 |
$ hg up .^^ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
472 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
473 |
$ echo cfoo > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
474 |
$ echo e > e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
475 |
$ hg add c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
476 |
$ hg ci -m "added c e" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
477 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
478 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
479 |
$ hg up 2 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
480 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
481 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
482 |
$ hg add d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
483 |
$ hg ci -m "added d" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
484 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
485 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
486 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
487 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
488 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
489 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
490 |
| o 4:e568fd1029bb added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
491 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
492 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
493 |
+---o 3:9150fe93bec6 added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
494 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
495 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
496 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
497 |
|/ draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
498 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
499 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
500 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
501 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
502 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
503 |
draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
504 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
505 |
$ hg prune 3 -s 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
506 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
507 |
$ hg prune 3 -s 4 --hidden |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
508 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
509 |
2 new content-divergent changesets |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
510 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
511 |
Change phase to public for one head: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
512 |
$ hg phase --public -r 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
513 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
514 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
515 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
516 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
517 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
518 |
| * 4:e568fd1029bb added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
519 |
| | draft content-divergent |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
520 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
521 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
522 |
|/ public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
523 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
524 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
525 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
526 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
527 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
528 |
public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
529 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
530 |
$ hg evolve --content-divergent --any |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
531 |
merge:[5] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
532 |
with: [4] added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
533 |
base: [3] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
534 |
rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
535 |
merging c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
536 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
537 |
fix conflicts and see `hg help evolve.interrupted` |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
538 |
[1] |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
539 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
540 |
$ hg diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
541 |
diff -r 155349b645be c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
542 |
--- a/c Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
543 |
+++ b/c Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
544 |
@@ -1,1 +1,5 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
545 |
+<<<<<<< destination: 155349b645be - test: added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
546 |
c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
547 |
+======= |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
548 |
+cfoo |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
549 |
+>>>>>>> evolving: e568fd1029bb - test: added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
550 |
diff -r 155349b645be e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
551 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
552 |
+++ b/e Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
553 |
@@ -0,0 +1,1 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
554 |
+e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
555 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
556 |
$ echo c > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
557 |
$ hg res -m |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
558 |
(no more unresolved files) |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
559 |
continue: hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
560 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
561 |
$ hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
562 |
evolving 4:e568fd1029bb "added c e" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
563 |
updating to "local" side of the conflict: 93cd84bbdaca |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
564 |
merging "other" content-divergent changeset '2af3359250d3' |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
565 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
566 |
computing new diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
567 |
committed as 06e4564a3897 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
568 |
working directory is now at 06e4564a3897 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
569 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
570 |
$ hg evolve -l |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
571 |
$ cd .. |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
572 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
573 |
Testing the case when relocation and merging both leads to conflicts: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
574 |
-------------------------------------------------------------------- |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
575 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
576 |
$ hg init pubdiv4 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
577 |
$ cd pubdiv4 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
578 |
$ for ch in a b c d; do |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
579 |
> echo $ch > $ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
580 |
> hg ci -Aqm "added "$ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
581 |
> done; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
582 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
583 |
$ hg up .^^ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
584 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
585 |
$ echo cfoo > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
586 |
$ echo e > e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
587 |
$ echo dconflict > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
588 |
$ hg add c e d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
589 |
$ hg ci -m "added c e" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
590 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
591 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
592 |
$ hg up 2 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
593 |
1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
594 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
595 |
$ hg add d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
596 |
$ hg ci -m "added d" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
597 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
598 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
599 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
600 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
601 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
602 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
603 |
| o 4:3c17c7afaf6e added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
604 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
605 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
606 |
+---o 3:9150fe93bec6 added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
607 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
608 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
609 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
610 |
|/ draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
611 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
612 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
613 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
614 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
615 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
616 |
draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
617 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
618 |
$ hg prune 3 -s 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
619 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
620 |
$ hg prune 3 -s 4 --hidden |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
621 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
622 |
2 new content-divergent changesets |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
623 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
624 |
Change phase to public for one head: |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
625 |
$ hg phase --public -r 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
626 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
627 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
628 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
629 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
630 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
631 |
| * 4:3c17c7afaf6e added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
632 |
| | draft content-divergent |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
633 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
634 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
635 |
|/ public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
636 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
637 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
638 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
639 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
640 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
641 |
public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
642 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
643 |
$ hg evolve --content-divergent --any |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
644 |
merge:[5] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
645 |
with: [4] added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
646 |
base: [3] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
647 |
rebasing "other" content-divergent changeset 3c17c7afaf6e on 155349b645be |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
648 |
merging c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
649 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
650 |
fix conflicts and see `hg help evolve.interrupted` |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
651 |
[1] |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
652 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
653 |
$ hg diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
654 |
diff -r 155349b645be c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
655 |
--- a/c Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
656 |
+++ b/c Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
657 |
@@ -1,1 +1,5 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
658 |
+<<<<<<< destination: 155349b645be - test: added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
659 |
c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
660 |
+======= |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
661 |
+cfoo |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
662 |
+>>>>>>> evolving: 3c17c7afaf6e - test: added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
663 |
diff -r 155349b645be d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
664 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
665 |
+++ b/d Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
666 |
@@ -0,0 +1,1 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
667 |
+dconflict |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
668 |
diff -r 155349b645be e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
669 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
670 |
+++ b/e Thu Jan 01 00:00:00 1970 +0000 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
671 |
@@ -0,0 +1,1 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
672 |
+e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
673 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
674 |
$ echo cfoo > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
675 |
$ hg res -m |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
676 |
(no more unresolved files) |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
677 |
continue: hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
678 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
679 |
$ hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
680 |
evolving 4:3c17c7afaf6e "added c e" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
681 |
updating to "local" side of the conflict: 93cd84bbdaca |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
682 |
merging "other" content-divergent changeset 'c4ce3d34e784' |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
683 |
merging d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
684 |
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
685 |
2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
686 |
fix conflicts and see `hg help evolve.interrupted` |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
687 |
[1] |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
688 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
689 |
$ echo d > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
690 |
$ hg res -m |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
691 |
(no more unresolved files) |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
692 |
continue: hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
693 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
694 |
$ hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
695 |
computing new diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
696 |
committed as b9082a9e66ce |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
697 |
working directory is now at b9082a9e66ce |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
698 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
699 |
$ hg evolve -l |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
700 |
$ 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
|
701 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
702 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
703 |
Testing the case when "merging results in same as public cset" where: |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
704 |
both the csets are on same parent and no conflict in merging. |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
705 |
--------------------------------------------------------------------- |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
706 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
707 |
Prepare the repo: |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
708 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
709 |
$ hg init pubdiv5 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
710 |
$ cd pubdiv5 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
711 |
$ for ch in a b c; do |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
712 |
> echo $ch > $ch; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
713 |
> hg ci -Am "added "$ch; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
714 |
> done; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
715 |
adding a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
716 |
adding b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
717 |
adding c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
718 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
719 |
$ hg up .^ |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
720 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
721 |
$ echo ch > ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
722 |
$ hg add ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
723 |
$ hg ci -m "added ch" |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
724 |
created new head |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
725 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
726 |
$ hg up .^ |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
727 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
728 |
$ echo ch > ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
729 |
$ hg add ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
730 |
$ hg ci -m "added c" |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
731 |
created new head |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
732 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
733 |
$ hg glog |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
734 |
@ 4:f7c1071f1e7c added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
735 |
| draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
736 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
737 |
| o 3:90522bccf499 added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
738 |
|/ draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
739 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
740 |
| o 2:155349b645be added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
741 |
|/ draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
742 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
743 |
o 1:5f6d8a4bf34a added b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
744 |
| draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
745 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
746 |
o 0:9092f1db7931 added a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
747 |
draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
748 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
749 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
750 |
$ hg prune 2 -s 3 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
751 |
1 changesets pruned |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
752 |
$ hg prune 2 -s 4 --hidden |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
753 |
1 changesets pruned |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
754 |
2 new content-divergent changesets |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
755 |
$ hg phase --public -r 4 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
756 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
757 |
$ hg glog |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
758 |
@ 4:f7c1071f1e7c added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
759 |
| public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
760 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
761 |
| * 3:90522bccf499 added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
762 |
|/ draft content-divergent |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
763 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
764 |
o 1:5f6d8a4bf34a added b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
765 |
| public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
766 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
767 |
o 0:9092f1db7931 added a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
768 |
public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
769 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
770 |
$ hg evolve --content-divergent --any |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
771 |
merge:[4] added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
772 |
with: [3] added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
773 |
base: [2] added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
774 |
merging "other" content-divergent changeset '90522bccf499' |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
775 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
776 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
777 |
$ hg evolve -l |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
778 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
779 |
$ hg par |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
780 |
changeset: 4:f7c1071f1e7c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
781 |
tag: tip |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
782 |
parent: 1:5f6d8a4bf34a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
783 |
user: test |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
784 |
date: Thu Jan 01 00:00:00 1970 +0000 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
785 |
summary: added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
786 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
787 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
788 |
Testing the case when "merging results in same as public cset" where: |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
789 |
both the csets are on different parent and no conflict in merging and relocation. |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
790 |
--------------------------------------------------------------------------------- |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
791 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
792 |
Prepare the repo: |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
793 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
794 |
$ cd .. |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
795 |
$ hg init pubdiv6 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
796 |
$ cd pubdiv6 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
797 |
$ for ch in a b c d; do |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
798 |
> echo $ch > $ch; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
799 |
> hg ci -Am "added "$ch; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
800 |
> done; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
801 |
adding a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
802 |
adding b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
803 |
adding c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
804 |
adding d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
805 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
806 |
$ hg up 1 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
807 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
808 |
$ echo dh > dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
809 |
$ hg add dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
810 |
$ hg ci -m "added dh" |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
811 |
created new head |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
812 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
813 |
$ hg up 2 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
814 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
815 |
$ echo dh > dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
816 |
$ hg add dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
817 |
$ hg ci -m "added d" |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
818 |
created new head |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
819 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
820 |
$ hg glog |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
821 |
@ 5:e800202333a4 added d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
822 |
| draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
823 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
824 |
| o 4:5acd58ef5066 added dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
825 |
| | draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
826 |
| | |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
827 |
+---o 3:9150fe93bec6 added d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
828 |
| | draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
829 |
| | |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
830 |
o | 2:155349b645be added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
831 |
|/ draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
832 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
833 |
o 1:5f6d8a4bf34a added b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
834 |
| draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
835 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
836 |
o 0:9092f1db7931 added a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
837 |
draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
838 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
839 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
840 |
$ hg prune 3 -s 4 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
841 |
1 changesets pruned |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
842 |
$ hg prune 3 -s 5 --hidden |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
843 |
1 changesets pruned |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
844 |
2 new content-divergent changesets |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
845 |
$ hg phase --public -r 5 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
846 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
847 |
$ hg glog |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
848 |
@ 5:e800202333a4 added d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
849 |
| public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
850 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
851 |
| * 4:5acd58ef5066 added dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
852 |
| | draft content-divergent |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
853 |
| | |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
854 |
o | 2:155349b645be added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
855 |
|/ public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
856 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
857 |
o 1:5f6d8a4bf34a added b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
858 |
| public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
859 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
860 |
o 0:9092f1db7931 added a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
861 |
public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
862 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
863 |
$ hg evolve --content-divergent --any |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
864 |
merge:[5] added d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
865 |
with: [4] added dh |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
866 |
base: [3] added d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
867 |
rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
868 |
updating to "local" side of the conflict: e800202333a4 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
869 |
merging "other" content-divergent changeset 'ae3429430ef1' |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
870 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
871 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
872 |
$ hg evolve -l |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
873 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
874 |
$ hg par |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
875 |
changeset: 5:e800202333a4 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
876 |
tag: tip |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
877 |
parent: 2:155349b645be |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
878 |
user: test |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
879 |
date: Thu Jan 01 00:00:00 1970 +0000 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
880 |
summary: added d |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
881 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
882 |
Testing the case when "merging results in same as public cset" where: |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
883 |
both the csets are on same parent and merging leads to conflict. |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
884 |
--------------------------------------------------------------------- |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
885 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
886 |
Prepare the repo: |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
887 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
888 |
$ cd .. |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
889 |
$ hg init pubdiv7 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
890 |
$ cd pubdiv7 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
891 |
$ for ch in a b c; do |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
892 |
> echo $ch > $ch; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
893 |
> hg ci -Am "added "$ch; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
894 |
> done; |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
895 |
adding a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
896 |
adding b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
897 |
adding c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
898 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
899 |
$ hg up .^ |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
900 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
901 |
$ echo chconflict > ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
902 |
$ hg add ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
903 |
$ hg ci -m "added ch" |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
904 |
created new head |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
905 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
906 |
$ hg up .^ |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
907 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
908 |
$ echo ch > ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
909 |
$ hg add ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
910 |
$ hg ci -m "added c" |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
911 |
created new head |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
912 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
913 |
$ hg glog |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
914 |
@ 4:f7c1071f1e7c added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
915 |
| draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
916 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
917 |
| o 3:229da2719b19 added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
918 |
|/ draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
919 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
920 |
| o 2:155349b645be added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
921 |
|/ draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
922 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
923 |
o 1:5f6d8a4bf34a added b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
924 |
| draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
925 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
926 |
o 0:9092f1db7931 added a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
927 |
draft |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
928 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
929 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
930 |
$ hg prune 2 -s 3 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
931 |
1 changesets pruned |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
932 |
$ hg prune 2 -s 4 --hidden |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
933 |
1 changesets pruned |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
934 |
2 new content-divergent changesets |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
935 |
$ hg phase --public -r 4 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
936 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
937 |
$ hg glog |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
938 |
@ 4:f7c1071f1e7c added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
939 |
| public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
940 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
941 |
| * 3:229da2719b19 added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
942 |
|/ draft content-divergent |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
943 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
944 |
o 1:5f6d8a4bf34a added b |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
945 |
| public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
946 |
| |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
947 |
o 0:9092f1db7931 added a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
948 |
public |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
949 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
950 |
$ hg evolve --content-divergent --any |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
951 |
merge:[4] added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
952 |
with: [3] added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
953 |
base: [2] added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
954 |
merging "other" content-divergent changeset '229da2719b19' |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
955 |
merging ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
956 |
warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
957 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
958 |
fix conflicts and see `hg help evolve.interrupted` |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
959 |
[1] |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
960 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
961 |
$ hg diff |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
962 |
diff -r f7c1071f1e7c ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
963 |
--- a/ch Thu Jan 01 00:00:00 1970 +0000 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
964 |
+++ b/ch Thu Jan 01 00:00:00 1970 +0000 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
965 |
@@ -1,1 +1,5 @@ |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
966 |
+<<<<<<< local: f7c1071f1e7c - test: added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
967 |
ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
968 |
+======= |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
969 |
+chconflict |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
970 |
+>>>>>>> other: 229da2719b19 - test: added ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
971 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
972 |
$ echo ch > ch |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
973 |
$ hg res -m |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
974 |
(no more unresolved files) |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
975 |
continue: hg evolve --continue |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
976 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
977 |
$ hg evolve --continue |
4417
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
978 |
working directory is now at f7c1071f1e7c |
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
|
979 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
980 |
$ hg evolve -l |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
981 |
|
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
982 |
$ hg par |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
983 |
changeset: 4:f7c1071f1e7c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
984 |
tag: tip |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
985 |
parent: 1:5f6d8a4bf34a |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
986 |
user: test |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
987 |
date: Thu Jan 01 00:00:00 1970 +0000 |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
988 |
summary: added c |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
989 |
|
4417
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
990 |
Testing the case when "merging results in same as public cset" where: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
991 |
both the csets are on different parent and relocation leads to conflict but merging won't. |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
992 |
------------------------------------------------------------------------------------------ |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
993 |
Prepare the repo: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
994 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
995 |
$ cd .. |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
996 |
$ hg init pubdiv8 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
997 |
$ cd pubdiv8 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
998 |
$ for ch in a b c d; do |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
999 |
> echo $ch > $ch; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1000 |
> hg ci -Am "added "$ch; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1001 |
> done; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1002 |
adding a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1003 |
adding b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1004 |
adding c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1005 |
adding d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1006 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1007 |
$ hg up 1 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1008 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1009 |
$ echo dh > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1010 |
$ echo cc > c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1011 |
$ hg add dh c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1012 |
$ hg ci -m "added dh" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1013 |
created new head |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1014 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1015 |
$ hg up 2 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1016 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1017 |
$ echo dh > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1018 |
$ hg add dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1019 |
$ hg ci -m "added d" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1020 |
created new head |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1021 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1022 |
$ hg glog |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1023 |
@ 5:e800202333a4 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1024 |
| draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1025 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1026 |
| o 4:f89a8e2f86ac added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1027 |
| | draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1028 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1029 |
+---o 3:9150fe93bec6 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1030 |
| | draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1031 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1032 |
o | 2:155349b645be added c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1033 |
|/ draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1034 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1035 |
o 1:5f6d8a4bf34a added b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1036 |
| draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1037 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1038 |
o 0:9092f1db7931 added a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1039 |
draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1040 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1041 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1042 |
$ hg prune 3 -s 4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1043 |
1 changesets pruned |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1044 |
$ hg prune 3 -s 5 --hidden |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1045 |
1 changesets pruned |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1046 |
2 new content-divergent changesets |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1047 |
$ hg phase --public -r 5 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1048 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1049 |
$ hg glog |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1050 |
@ 5:e800202333a4 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1051 |
| public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1052 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1053 |
| * 4:f89a8e2f86ac added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1054 |
| | draft content-divergent |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1055 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1056 |
o | 2:155349b645be added c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1057 |
|/ public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1058 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1059 |
o 1:5f6d8a4bf34a added b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1060 |
| public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1061 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1062 |
o 0:9092f1db7931 added a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1063 |
public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1064 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1065 |
$ hg evolve --content-divergent --any |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1066 |
merge:[5] added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1067 |
with: [4] added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1068 |
base: [3] added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1069 |
rebasing "other" content-divergent changeset f89a8e2f86ac on 155349b645be |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1070 |
merging c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1071 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1072 |
fix conflicts and see `hg help evolve.interrupted` |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1073 |
[1] |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1074 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1075 |
$ echo c > c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1076 |
$ hg res -m |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1077 |
(no more unresolved files) |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1078 |
continue: hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1079 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1080 |
$ hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1081 |
evolving 4:f89a8e2f86ac "added dh" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1082 |
updating to "local" side of the conflict: e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1083 |
merging "other" content-divergent changeset 'bc309da55b88' |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1084 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1085 |
working directory is now at e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1086 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1087 |
$ hg evolve -l |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1088 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1089 |
$ hg par |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1090 |
changeset: 5:e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1091 |
tag: tip |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1092 |
parent: 2:155349b645be |
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
|
1093 |
user: test |
b2a8e67b0933
evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4413
diff
changeset
|
1094 |
date: Thu Jan 01 00:00:00 1970 +0000 |
4417
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1095 |
summary: added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1096 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1097 |
Testing the case when "merging results in same as public cset" where: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1098 |
both the csets are on different parent and merging leads to conflict but relocation won't. |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1099 |
------------------------------------------------------------------------------------------ |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1100 |
Prepare the repo: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1101 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1102 |
$ cd .. |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1103 |
$ hg init pubdiv9 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1104 |
$ cd pubdiv9 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1105 |
$ for ch in a b c d; do |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1106 |
> echo $ch > $ch; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1107 |
> hg ci -Am "added "$ch; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1108 |
> done; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1109 |
adding a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1110 |
adding b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1111 |
adding c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1112 |
adding d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1113 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1114 |
$ hg up 1 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1115 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1116 |
$ echo dhconflict > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1117 |
$ hg add dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1118 |
$ hg ci -m "added dh" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1119 |
created new head |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1120 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1121 |
$ hg up 2 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1122 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1123 |
$ echo dh > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1124 |
$ hg add dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1125 |
$ hg ci -m "added d" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1126 |
created new head |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1127 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1128 |
$ hg glog |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1129 |
@ 5:e800202333a4 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1130 |
| draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1131 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1132 |
| o 4:db0b7bba0aae added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1133 |
| | draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1134 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1135 |
+---o 3:9150fe93bec6 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1136 |
| | draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1137 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1138 |
o | 2:155349b645be added c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1139 |
|/ draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1140 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1141 |
o 1:5f6d8a4bf34a added b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1142 |
| draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1143 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1144 |
o 0:9092f1db7931 added a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1145 |
draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1146 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1147 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1148 |
$ hg prune 3 -s 4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1149 |
1 changesets pruned |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1150 |
$ hg prune 3 -s 5 --hidden |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1151 |
1 changesets pruned |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1152 |
2 new content-divergent changesets |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1153 |
$ hg phase --public -r 5 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1154 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1155 |
$ hg glog |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1156 |
@ 5:e800202333a4 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1157 |
| public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1158 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1159 |
| * 4:db0b7bba0aae added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1160 |
| | draft content-divergent |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1161 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1162 |
o | 2:155349b645be added c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1163 |
|/ public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1164 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1165 |
o 1:5f6d8a4bf34a added b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1166 |
| public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1167 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1168 |
o 0:9092f1db7931 added a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1169 |
public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1170 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1171 |
$ hg evolve --content-divergent --any |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1172 |
merge:[5] added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1173 |
with: [4] added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1174 |
base: [3] added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1175 |
rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1176 |
updating to "local" side of the conflict: e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1177 |
merging "other" content-divergent changeset 'a5bbf2042450' |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1178 |
merging dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1179 |
warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1180 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1181 |
fix conflicts and see `hg help evolve.interrupted` |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1182 |
[1] |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1183 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1184 |
$ echo dh > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1185 |
$ hg res -m |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1186 |
(no more unresolved files) |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1187 |
continue: hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1188 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1189 |
$ hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1190 |
working directory is now at e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1191 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1192 |
$ hg evolve -l |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1193 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1194 |
$ hg par |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1195 |
changeset: 5:e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1196 |
tag: tip |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1197 |
parent: 2:155349b645be |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1198 |
user: test |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1199 |
date: Thu Jan 01 00:00:00 1970 +0000 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1200 |
summary: added d |
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
|
1201 |
|
4417
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1202 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1203 |
Testing the case when "merging results in same as public cset" where: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1204 |
both the csets are on different parent and relocation and merging both leads to conflict: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1205 |
----------------------------------------------------------------------------------------- |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1206 |
Prepare the repo: |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1207 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1208 |
$ cd .. |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1209 |
$ hg init pubdiv10 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1210 |
$ cd pubdiv10 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1211 |
$ for ch in a b c d; do |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1212 |
> echo $ch > $ch; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1213 |
> hg ci -Am "added "$ch; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1214 |
> done; |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1215 |
adding a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1216 |
adding b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1217 |
adding c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1218 |
adding d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1219 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1220 |
$ hg up 1 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1221 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1222 |
$ echo dhconflict > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1223 |
$ echo cc > c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1224 |
$ hg add dh c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1225 |
$ hg ci -m "added dh" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1226 |
created new head |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1227 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1228 |
$ hg up 2 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1229 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1230 |
$ echo dh > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1231 |
$ hg add dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1232 |
$ hg ci -m "added d" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1233 |
created new head |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1234 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1235 |
$ hg glog |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1236 |
@ 5:e800202333a4 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1237 |
| draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1238 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1239 |
| o 4:67b19bbd770f added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1240 |
| | draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1241 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1242 |
+---o 3:9150fe93bec6 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1243 |
| | draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1244 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1245 |
o | 2:155349b645be added c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1246 |
|/ draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1247 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1248 |
o 1:5f6d8a4bf34a added b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1249 |
| draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1250 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1251 |
o 0:9092f1db7931 added a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1252 |
draft |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1253 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1254 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1255 |
$ hg prune 3 -s 4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1256 |
1 changesets pruned |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1257 |
$ hg prune 3 -s 5 --hidden |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1258 |
1 changesets pruned |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1259 |
2 new content-divergent changesets |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1260 |
$ hg phase --public -r 5 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1261 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1262 |
$ hg glog |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1263 |
@ 5:e800202333a4 added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1264 |
| public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1265 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1266 |
| * 4:67b19bbd770f added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1267 |
| | draft content-divergent |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1268 |
| | |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1269 |
o | 2:155349b645be added c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1270 |
|/ public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1271 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1272 |
o 1:5f6d8a4bf34a added b |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1273 |
| public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1274 |
| |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1275 |
o 0:9092f1db7931 added a |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1276 |
public |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1277 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1278 |
$ hg evolve --content-divergent --any |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1279 |
merge:[5] added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1280 |
with: [4] added dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1281 |
base: [3] added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1282 |
rebasing "other" content-divergent changeset 67b19bbd770f on 155349b645be |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1283 |
merging c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1284 |
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1285 |
fix conflicts and see `hg help evolve.interrupted` |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1286 |
[1] |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1287 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1288 |
$ echo c > c |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1289 |
$ hg res -m |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1290 |
(no more unresolved files) |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1291 |
continue: hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1292 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1293 |
$ hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1294 |
evolving 4:67b19bbd770f "added dh" |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1295 |
updating to "local" side of the conflict: e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1296 |
merging "other" content-divergent changeset '09054d1f3c97' |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1297 |
merging dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1298 |
warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1299 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1300 |
fix conflicts and see `hg help evolve.interrupted` |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1301 |
[1] |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1302 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1303 |
$ echo dh > dh |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1304 |
$ hg res -m |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1305 |
(no more unresolved files) |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1306 |
continue: hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1307 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1308 |
$ hg evolve --continue |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1309 |
working directory is now at e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1310 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1311 |
$ hg evolve -l |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1312 |
|
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1313 |
$ hg par |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1314 |
changeset: 5:e800202333a4 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1315 |
tag: tip |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1316 |
parent: 2:155349b645be |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1317 |
user: test |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1318 |
date: Thu Jan 01 00:00:00 1970 +0000 |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1319 |
summary: added d |
b86413cfca4a
evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4416
diff
changeset
|
1320 |
|