author | Adrian Buehlmann <adrian@cadifra.com> |
Fri, 10 Sep 2010 17:59:17 +0200 | |
changeset 12204 | c55d69c5fb77 |
parent 12156 | 4c94b6d0fb1c |
permissions | -rw-r--r-- |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
1 |
1:08a16e8e4408 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
2 |
0:d29c767a4b52 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
3 |
08a16e8e4408 tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2036
diff
changeset
|
4 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
5 |
d29c767a4b52 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
6 |
d29c767a4b52+ |
2029
d436b21b20dc
rewrite revert command. fix issues 93, 123, 147.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
7 |
reverting file1 |
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset
|
8 |
? file1.orig |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
9 |
d29c767a4b52 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2036
diff
changeset
|
10 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset
|
11 |
? file1.orig |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
12 |
08a16e8e4408 tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2036
diff
changeset
|
13 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3400
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3311
diff
changeset
|
14 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset
|
15 |
? file1.orig |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
16 |
08a16e8e4408 tip |
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset
|
17 |
? file1.orig |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
18 |
08a16e8e4408 tip |
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset
|
19 |
? file1.orig |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
20 |
08a16e8e4408 tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2036
diff
changeset
|
21 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2030
8d9ec30d58bc
forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2029
diff
changeset
|
22 |
? file1.orig |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
3400
diff
changeset
|
23 |
08a16e8e4408 tip |