Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-backout.out @ 2451:134227b82a96
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 17 Jun 2006 18:36:04 +0200 |
parents | 8fe3d60b7f19 |
children | 2f4addf56715 |
rev | line source |
---|---|
2158 | 1 # basic operation |
2 adding a | |
2407
8fe3d60b7f19
revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2303
diff
changeset
|
3 reverting a |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
4 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 |
2158 | 5 a |
6 # file that was removed is recreated | |
7 adding a | |
8 adding a | |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
9 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 |
2158 | 10 content |
11 # backout of backout is as if nothing happened | |
12 removing a | |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
13 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a |
2158 | 14 cat: a: No such file or directory |
15 # backout with merge | |
16 adding a | |
2407
8fe3d60b7f19
revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2303
diff
changeset
|
17 reverting a |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
18 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 |
2158 | 19 merging with changeset 2:b66ea5b77abb |
20 merging a | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
22 (branch merge, don't forget to commit) |
2158 | 23 line 1 |