| author | Matt Mackall <mpm@selenic.com> |
| Sun, 10 Dec 2006 19:20:35 -0600 | |
| changeset 3865 | 36a957364b1b |
| parent 3503 | b28d3e0f9a8c |
| permissions | -rw-r--r-- |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
1 |
adding a |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
2 |
adding b |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
3 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3503
b28d3e0f9a8c
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com>
parents:
3071
diff
changeset
|
4 |
the --branches option is deprecated, please use 'hg branches' instead |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
5 |
changeset: 0:b544c4ac4389 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
6 |
user: test |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
7 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
8 |
summary: 0 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
9 |
|
|
3503
b28d3e0f9a8c
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com>
parents:
3071
diff
changeset
|
10 |
the --branch option is deprecated, please use 'hg branch' instead |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
11 |
Using head f4ac749470f2 for branch foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
12 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
13 |
changeset: 1:f4ac749470f2 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
14 |
tag: foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
15 |
tag: tip |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
16 |
user: test |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
17 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
18 |
summary: 1 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
19 |
|
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
20 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
21 |
adding c |
|
3503
b28d3e0f9a8c
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com>
parents:
3071
diff
changeset
|
22 |
the --branch option is deprecated, please use 'hg branch' instead |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
23 |
Using head f4ac749470f2 for branch foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
24 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
25 |
(branch merge, don't forget to commit) |
|
3503
b28d3e0f9a8c
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com>
parents:
3071
diff
changeset
|
26 |
the --branches option is deprecated, please use 'hg branches' instead |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
27 |
changeset: 2:1505d56ee00e |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
28 |
tag: tip |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
29 |
parent: 0:b544c4ac4389 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
30 |
user: test |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
31 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
32 |
summary: 0.0 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
33 |
|
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
34 |
changeset: 1:f4ac749470f2 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
35 |
tag: foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
36 |
branch: foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
37 |
user: test |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
38 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
39 |
summary: 1 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
40 |
|
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
41 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
42 |
adding d |
|
3503
b28d3e0f9a8c
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com>
parents:
3071
diff
changeset
|
43 |
the --branch option is deprecated, please use 'hg branch' instead |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
44 |
Using head f4ac749470f2 for branch foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
45 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
46 |
(branch merge, don't forget to commit) |
|
3503
b28d3e0f9a8c
Deprecate old --branch/branches options
Matt Mackall <mpm@selenic.com>
parents:
3071
diff
changeset
|
47 |
the --branches option is deprecated, please use 'hg branches' instead |
|
3071
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
48 |
changeset: 3:53b72df12ae5 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
49 |
tag: tip |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
50 |
parent: 0:b544c4ac4389 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
51 |
user: test |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
52 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
53 |
summary: 0.0 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
54 |
|
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
55 |
changeset: 1:f4ac749470f2 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
56 |
tag: foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
57 |
branch: foo |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
58 |
user: test |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
59 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
60 |
summary: 1 |
|
547d1a4aa105
hg merge: fix lookup of branch
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
61 |