author | mpm@selenic.com |
Fri, 01 Jul 2005 14:43:36 -0800 | |
changeset 567 | 87f37e61d0db |
parent 547 | 4fc63e22b1fe |
child 591 | eb46971fc57f |
permissions | -rw-r--r-- |
331 | 1 |
+ mkdir r1 |
2 |
+ cd r1 |
|
3 |
+ hg init |
|
4 |
+ echo a |
|
5 |
+ hg addremove |
|
6 |
+ hg commit -t 1 -u test -d '0 0' |
|
485 | 7 |
+ hg clone . ../r2 |
8 |
+ cd ../r2 |
|
331 | 9 |
+ hg up |
10 |
+ echo abc |
|
11 |
+ hg diff |
|
12 |
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
388
diff
changeset
|
13 |
diff -r c19d34741b0a a |
331 | 14 |
--- a/a |
15 |
+++ b/a |
|
16 |
@@ -1,1 +1,1 @@ |
|
17 |
-a |
|
18 |
+abc |
|
19 |
+ cd ../r1 |
|
20 |
+ echo b |
|
21 |
+ echo a2 |
|
22 |
+ hg addremove |
|
23 |
+ hg commit -t 2 -u test -d '0 0' |
|
24 |
+ cd ../r2 |
|
25 |
+ hg -q pull ../r1 |
|
26 |
+ hg status |
|
27 |
C a |
|
28 |
+ hg -d up |
|
29 |
resolving manifests |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
30 |
ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
331 | 31 |
a versions differ, resolve |
32 |
remote created b |
|
33 |
getting b |
|
34 |
merging a |
|
35 |
resolving a |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
36 |
file a: other d730145abbf9 ancestor b789fdd96dc2 |
331 | 37 |
+ hg -d up -m |
38 |
resolving manifests |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
39 |
ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
331 | 40 |
+ hg parents |
41 |
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
42 |
tag: tip |
331 | 43 |
user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
44 |
date: Thu Jan 1 00:00:00 1970 |
331 | 45 |
summary: 2 |
46 |
||
47 |
+ hg -v history |
|
48 |
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
49 |
tag: tip |
331 | 50 |
manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
51 |
user: test |
|
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
52 |
date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
53 |
files: a b |
331 | 54 |
description: |
55 |
2 |
|
56 |
||
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
57 |
|
331 | 58 |
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
59 |
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
60 |
user: test |
|
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
61 |
date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
62 |
files: a |
331 | 63 |
description: |
64 |
1 |
|
65 |
||
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
66 |
|
331 | 67 |
+ hg diff |
68 |
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
388
diff
changeset
|
69 |
diff -r 1e71731e6fbb a |
331 | 70 |
--- a/a |
71 |
+++ b/a |
|
72 |
@@ -1,1 +1,1 @@ |
|
73 |
-a2 |
|
74 |
+abc |