| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Mon, 13 Mar 2006 08:56:59 +0100 | |
| changeset 1922 | 6d50d6189269 |
| parent 1043 | 9344f5dd4488 |
| child 1933 | 7544700fd931 |
| permissions | -rw-r--r-- |
| 412 | 1 |
pulling from ../test1 |
2 |
requesting all changes |
|
3 |
adding changesets |
|
4 |
adding manifests |
|
| 775 | 5 |
adding file changes |
6 |
added 1 changesets with 2 changes to 2 files |
|
| 412 | 7 |
(run 'hg update' to get a working copy) |
8 |
pulling from ../test2 |
|
9 |
searching for changes |
|
10 |
adding changesets |
|
11 |
adding manifests |
|
| 775 | 12 |
adding file changes |
| 1043 | 13 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
| 412 | 14 |
(run 'hg update' to get a working copy) |
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
15 |
changeset: 2:3ef543305655 |
| 412 | 16 |
tag: tip |
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
17 |
parent: 0:22a449e20da5 |
| 412 | 18 |
user: test |
|
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
19 |
date: Thu Jan 1 00:00:00 1970 +0000 |
| 412 | 20 |
summary: chmod +x a |
21 |
||
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
22 |
changeset: 1:c6ecefc45368 |
| 412 | 23 |
user: test |
|
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
24 |
date: Thu Jan 1 00:00:00 1970 +0000 |
| 412 | 25 |
summary: a updated |
26 |
||
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
27 |
changeset: 2:3ef543305655 |
| 412 | 28 |
tag: tip |
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
29 |
parent: 0:22a449e20da5 |
| 412 | 30 |
user: test |
|
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
31 |
date: Thu Jan 1 00:00:00 1970 +0000 |
| 412 | 32 |
summary: chmod +x a |
33 |
||
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
34 |
changeset: 1:c6ecefc45368 |
| 412 | 35 |
user: test |
|
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
36 |
date: Thu Jan 1 00:00:00 1970 +0000 |
| 412 | 37 |
summary: a updated |
38 |
||
|
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
39 |
changeset: 0:22a449e20da5 |
| 412 | 40 |
user: test |
|
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
41 |
date: Thu Jan 1 00:00:00 1970 +0000 |
| 412 | 42 |
summary: added a b |
43 |
||
44 |
resolving manifests |
|
45 |
merging a |
|
46 |
resolving a |
|
|
1922
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
47 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
48 |
(branch merge, don't forget to commit) |
|
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
49 |
-rwxr-x--- |
|
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
50 |
-rwxr-x--- |