Mercurial > hg > mercurial

annotate mercurial-tests/testData/merge/README @ 953:ef995b1ed5ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update dsl attributes
author Dmitry Neverov <dmitry.neverov@gmail.com>
date Wed, 22 Jun 2016 21:33:59 +0200
parents 4cf1ab3cd162
children
rev   line source
643
2f6c4b61686a Don't throw errors for merge into same branch
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
1 no.subrepos
2f6c4b61686a Don't throw errors for merge into same branch
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
2
645
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
3 o 4:79d836707416 topic2
643
2f6c4b61686a Don't throw errors for merge into same branch
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
4 |
645
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
5 | o 3:2742914d19b2 topic1
643
2f6c4b61686a Don't throw errors for merge into same branch
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
6 |/
645
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
7 | o 2:09dd527b77ec
643
2f6c4b61686a Don't throw errors for merge into same branch
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
8 |/
645
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
9 o 1:6370ce18689a
643
2f6c4b61686a Don't throw errors for merge into same branch
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
10 |
645
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
11 o 0:7e3988f0f412
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
12
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
13
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
14
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
15 subrepo1
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
16
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
17 o 6:eb211547efbe ~> subrepo2 675fa105b184
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
18 |
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
19 | o 5:a3db56ba38d3 topic3 ~> subrepo2 085a6376bbce
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
20 | |
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
21 | | o 4:3e43f76179ed topic2 ~> subrepo2 085a6376bbce
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
22 | |/
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
23 | | o 3:0bd1ae88632d topic1 ~> subrepo2 1532dee5d922
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
24 | |/
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
25 o | 2:111ee5cb00c8 ~> subrepo2 627ca21f914a
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
26 |/
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
27 o 1:a4bb39f3d42b ~> subrepo2 627ca21f914a
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
28 |
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
29 o 0:f43f3725e922
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
30
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
31
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
32 subrepo2
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
33
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
34 o 4:085a6376bbce topic2
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
35 |
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
36 | o 3:1532dee5d922 topic1
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
37 |/
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
38 | o 2:675fa105b184
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
39 |/
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
40 o 1:627ca21f914a
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
41 |
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
42 o 0:5a88c102487e
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
43
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
44
4cf1ab3cd162 Merge in subrepos
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 643
diff changeset
45