| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
| Fri, 13 Dec 2019 01:29:27 +0530 | |
| changeset 5013 | 18fe83bf7b14 |
| parent 4636 | c0e9a3c01c44 |
| child 5079 | 1f92a6aa40d6 |
| permissions | -rw-r--r-- |
|
4482
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
1 |
+==================================================== |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
2 |
+Tests the resolution of content divergence: metadata |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
3 |
+==================================================== |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
4 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
5 |
This file intend to cover cases focused around meta data merging. |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
6 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
7 |
Setup |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
8 |
----- |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
9 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
10 |
$ cat >> $HGRCPATH <<EOF |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
11 |
> [alias] |
|
4625
a4fde4e3e763
templatekw: add `instabilities` alias for `troubles`
Matt Harbison <matt_harbison@yahoo.com>
parents:
4577
diff
changeset
|
12 |
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {instabilities}\n\n" |
|
4482
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
13 |
> [phases] |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
14 |
> publish = False |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
15 |
> [extensions] |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
16 |
> rebase = |
|
5013
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
17 |
> strip = |
|
4482
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
18 |
> EOF |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
19 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
20 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
21 |
Check we preserve the author properly |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
22 |
------------------------------------- |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
23 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
24 |
Testing issue6113 to make sure that content-divergence resolution don't |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
25 |
replace initial author with the user running the resolution command: |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
26 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
27 |
$ hg init userfoo |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
28 |
$ cd userfoo |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
29 |
$ unset HGUSER |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
30 |
$ echo "[ui]" >> ./.hg/hgrc |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
31 |
$ echo "username = foo <foo@test.com>" >> ./.hg/hgrc |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
32 |
$ for ch in a b c; do |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
33 |
> echo $ch > $ch; |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
34 |
> hg add $ch; |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
35 |
> hg ci -m "added "$ch; |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
36 |
> done; |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
37 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
38 |
$ cd .. |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
39 |
$ hg init userbar |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
40 |
$ cd userbar |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
41 |
$ unset HGUSER |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
42 |
$ echo "[ui]" >> ./.hg/hgrc |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
43 |
$ echo "username = bar <bar@test.com>" >> ./.hg/hgrc |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
44 |
$ hg pull ./../userfoo -q |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
45 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
46 |
$ cd ../userfoo |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
47 |
$ hg up -r "desc('added b')" |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
48 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
49 |
$ echo c > c |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
50 |
$ echo e > e |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
51 |
$ hg add c e |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
52 |
$ hg ci -m "added c e" |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
53 |
created new head |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
54 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
55 |
$ hg up -r "desc('added b')" |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
56 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
57 |
$ echo cc > c |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
58 |
$ hg add c |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
59 |
$ hg ci -m "added c" |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
60 |
created new head |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
61 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
62 |
$ hg prune -r "min(desc('added c'))" -s "desc('added c e')" |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
63 |
1 changesets pruned |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
64 |
$ hg prune -r "min(desc('added c'))" -s "max(desc('added c'))" --hidden |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
65 |
1 changesets pruned |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
66 |
2 new content-divergent changesets |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
67 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
68 |
$ hg glog |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
69 |
@ 4:6c06cda6dc99 added c |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
70 |
| draft content-divergent |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
71 |
| |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
72 |
| * 3:0c9267e23c9d added c e |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
73 |
|/ draft content-divergent |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
74 |
| |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
75 |
o 1:1740ad2a1eda added b |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
76 |
| draft |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
77 |
| |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
78 |
o 0:f863f39764c4 added a |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
79 |
draft |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
80 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
81 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
82 |
$ cd ../userbar |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
83 |
$ hg pull ./../userfoo -q |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
84 |
2 new content-divergent changesets |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
85 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
86 |
$ hg evolve --content-divergent --any |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
87 |
merge:[3] added c e |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
88 |
with: [4] added c |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
89 |
base: [2] added c |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
90 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
91 |
|
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
92 |
Make sure resultant cset don't replace the initial user with user running the command: |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
93 |
$ hg log -r tip |
|
4483
7978230faa32
evolve: make sure div resolution don't replace the initial author (issue6113)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4482
diff
changeset
|
94 |
changeset: 5:443bd2972210 |
|
4482
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
95 |
tag: tip |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
96 |
parent: 1:1740ad2a1eda |
|
4483
7978230faa32
evolve: make sure div resolution don't replace the initial author (issue6113)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4482
diff
changeset
|
97 |
user: foo <foo@test.com> |
|
4482
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
98 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
99 |
summary: added c e |
|
ee7e4e05ce44
evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
100 |
|
|
4635
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
101 |
$ cd .. |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
102 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
103 |
Testing the three way merge logic for user of content divergent changesets |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
104 |
-------------------------------------------------------------------------- |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
105 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
106 |
$ hg init mergeusers |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
107 |
$ cd mergeusers |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
108 |
$ for ch in a b c; do |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
109 |
> touch $ch |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
110 |
> hg add $ch |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
111 |
> hg ci -m "added "$ch |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
112 |
> done; |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
113 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
114 |
$ hg amend -m "updated c" |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
115 |
$ hg up -r 'desc("added c")' --hidden -q |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
116 |
updated to hidden changeset 2b3c31fe982d |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
117 |
(hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
118 |
working directory parent is obsolete! (2b3c31fe982d) |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
119 |
$ echo coco > c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
120 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
121 |
1) when one user is different wrt base |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
122 |
-------------------------------------- |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
123 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
124 |
Insert a diverging author name: |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
125 |
$ hg amend -u 'foouser' |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
126 |
2 new content-divergent changesets |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
127 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
128 |
Run automatic evolution: |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
129 |
$ hg evolve --content-divergent |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
130 |
merge:[3] updated c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
131 |
with: [4] added c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
132 |
base: [2] added c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
133 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
134 |
working directory is now at 932d6ceb7672 |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
135 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
136 |
$ hg log -r tip | grep "^user" |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
137 |
user: foouser |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
138 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
139 |
$ hg strip . -q --config extensions.strip= |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
140 |
2 new content-divergent changesets |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
141 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
142 |
2) when both the user are different wrt base |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
143 |
-------------------------------------------- |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
144 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
145 |
$ hg up -r 'max(desc("updated c"))' |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
146 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
147 |
$ hg amend -u 'baruser' |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
148 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
149 |
Run automatic evolution: |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
150 |
$ hg evolve --content-divergent |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
151 |
merge:[4] added c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
152 |
with: [5] updated c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
153 |
base: [2] added c |
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
154 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4636
c0e9a3c01c44
evolve: consider using three way merge to get the user for div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4635
diff
changeset
|
155 |
working directory is now at 202a770d8c1f |
|
4635
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
156 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
157 |
$ hg log -r tip | grep "^user" |
|
4636
c0e9a3c01c44
evolve: consider using three way merge to get the user for div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4635
diff
changeset
|
158 |
user: baruser, foouser |
|
4635
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
159 |
|
|
ea9ae2d2095a
evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4633
diff
changeset
|
160 |
$ cd .. |
|
5013
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
161 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
162 |
Test the content-divergence resolution involving date update |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
163 |
------------------------------------------------------------ |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
164 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
165 |
$ hg init divergingdate |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
166 |
$ cd divergingdate |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
167 |
$ unset HGUSER |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
168 |
$ echo "[ui]" >> ./.hg/hgrc |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
169 |
$ echo "username = test" >> ./.hg/hgrc |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
170 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
171 |
$ echo hi > r0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
172 |
$ hg ci -qAm 'add r0' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
173 |
$ echo hi > foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
174 |
$ hg ci -qAm 'add foo.txt' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
175 |
$ hg metaedit -r . -d '0 2' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
176 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
177 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
178 |
date: updated on both side to the same value |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
179 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
180 |
$ echo hi > bar.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
181 |
$ hg add -q bar.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
182 |
$ hg amend -q |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
183 |
$ hg metaedit -r 1 -d '0 1' --hidden |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
184 |
2 new content-divergent changesets |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
185 |
$ hg log -G |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
186 |
* changeset: 4:c17bf400a278 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
187 |
| tag: tip |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
188 |
| parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
189 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
190 |
| date: Wed Dec 31 23:59:59 1969 -0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
191 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
192 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
193 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
194 |
| @ changeset: 3:a25dd7af6cf6 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
195 |
|/ parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
196 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
197 |
| date: Wed Dec 31 23:59:58 1969 -0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
198 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
199 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
200 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
201 |
o changeset: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
202 |
user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
203 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
204 |
summary: add r0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
205 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
206 |
$ hg evolve --list --rev . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
207 |
a25dd7af6cf6: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
208 |
content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00) |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
209 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
210 |
$ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
211 |
1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
212 |
$ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
213 |
3 a25dd7af6cf6 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
214 |
4 c17bf400a278 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
215 |
$ hg evolve --content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
216 |
merge:[3] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
217 |
with: [4] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
218 |
base: [1] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
219 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
220 |
working directory is now at 6c144bb30333 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
221 |
$ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
222 |
5 6c144bb30333 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
223 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
224 |
date: updated one one side to an older value |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
225 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
226 |
$ hg strip . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
227 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
228 |
saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/6c144bb30333-72e26b88-backup.hg |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
229 |
2 new content-divergent changesets |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
230 |
$ hg up tip |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
231 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
232 |
$ hg amend --date "0 3" |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
233 |
$ hg log -G |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
234 |
@ changeset: 5:6189a9adfff0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
235 |
| tag: tip |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
236 |
| parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
237 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
238 |
| date: Wed Dec 31 23:59:57 1969 -0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
239 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
240 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
241 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
242 |
| * changeset: 3:a25dd7af6cf6 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
243 |
|/ parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
244 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
245 |
| date: Wed Dec 31 23:59:58 1969 -0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
246 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
247 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
248 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
249 |
o changeset: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
250 |
user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
251 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
252 |
summary: add r0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
253 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
254 |
$ hg evolve --list -r . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
255 |
6189a9adfff0: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
256 |
content-divergent: a25dd7af6cf6 (draft) (precursor cc71ffbc7c00) |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
257 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
258 |
$ hg log -r cc71ffbc7c00+6189a9adfff0+a25dd7af6cf6 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
259 |
1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
260 |
5 6189a9adfff0 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
261 |
3 a25dd7af6cf6 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
262 |
$ hg evolve --content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
263 |
merge:[3] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
264 |
with: [5] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
265 |
base: [1] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
266 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
267 |
working directory is now at 806d0024c04d |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
268 |
$ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
269 |
6 806d0024c04d 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
270 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
271 |
date: updated one side to an newer value |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
272 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
273 |
$ hg strip . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
274 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
275 |
saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/806d0024c04d-24cb28ad-backup.hg |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
276 |
2 new content-divergent changesets |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
277 |
$ hg update a25dd7af6cf6 --hidden |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
278 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
279 |
$ hg amend --date "120 0" |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
280 |
$ hg log -G |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
281 |
@ changeset: 6:5199d0bc13d4 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
282 |
| tag: tip |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
283 |
| parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
284 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
285 |
| date: Thu Jan 01 00:02:00 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
286 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
287 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
288 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
289 |
| * changeset: 5:6189a9adfff0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
290 |
|/ parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
291 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
292 |
| date: Wed Dec 31 23:59:57 1969 -0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
293 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
294 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
295 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
296 |
o changeset: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
297 |
user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
298 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
299 |
summary: add r0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
300 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
301 |
$ hg evolve --list -r . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
302 |
5199d0bc13d4: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
303 |
content-divergent: 6189a9adfff0 (draft) (precursor cc71ffbc7c00) |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
304 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
305 |
$ hg up 6189a9adfff0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
306 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
307 |
$ hg log -r cc71ffbc7c00+6189a9adfff0+5199d0bc13d4 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
308 |
1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
309 |
5 6189a9adfff0 1969-12-31 23:59 -0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
310 |
6 5199d0bc13d4 1970-01-01 00:02 +0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
311 |
$ hg evolve --content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
312 |
merge:[5] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
313 |
with: [6] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
314 |
base: [1] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
315 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
316 |
working directory is now at 51e08ac59670 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
317 |
$ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
318 |
7 51e08ac59670 1970-01-01 00:02 +0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
319 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
320 |
date: updated each side to a different value, newer should win |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
321 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
322 |
$ hg strip . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
323 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
324 |
saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/51e08ac59670-d8a3c2ca-backup.hg |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
325 |
2 new content-divergent changesets |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
326 |
$ hg up tip |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
327 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
328 |
$ hg amend --date "235 0" |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
329 |
$ hg update 6189a9adfff0 --hidden |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
330 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
331 |
$ hg amend --date "784 0" |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
332 |
$ hg log -G |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
333 |
@ changeset: 8:75254fb3164b |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
334 |
| tag: tip |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
335 |
| parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
336 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
337 |
| date: Thu Jan 01 00:13:04 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
338 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
339 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
340 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
341 |
| * changeset: 7:5421a7efcc6e |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
342 |
|/ parent: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
343 |
| user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
344 |
| date: Thu Jan 01 00:03:55 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
345 |
| instability: content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
346 |
| summary: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
347 |
| |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
348 |
o changeset: 0:a24ed8ad918c |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
349 |
user: test |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
350 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
351 |
summary: add r0 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
352 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
353 |
$ hg evolve --list -r . |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
354 |
75254fb3164b: add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
355 |
content-divergent: 5421a7efcc6e (draft) (precursor cc71ffbc7c00) |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
356 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
357 |
$ hg log -r 6189a9adfff0+5421a7efcc6e+75254fb3164b --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
358 |
5 6189a9adfff0 1969-12-31 23:59 -0000: date-changed using amend as 8:75254fb3164b |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
359 |
7 5421a7efcc6e 1970-01-01 00:03 +0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
360 |
8 75254fb3164b 1970-01-01 00:13 +0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
361 |
$ hg evolve --content-divergent |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
362 |
merge:[7] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
363 |
with: [8] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
364 |
base: [1] add foo.txt |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
365 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
366 |
working directory is now at ab7c0a425dc9 |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
367 |
$ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
368 |
9 ab7c0a425dc9 1970-01-01 00:13 +0000: |
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
369 |
|
|
18fe83bf7b14
evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4636
diff
changeset
|
370 |
$ cd .. |