Mercurial > hg
annotate tests/test-backout.out @ 2383:dec7aa404dcf
Ignore the .exe setup file for Windows
author | Marco Barisione <marco@barisione.org> |
---|---|
date | Mon, 22 May 2006 14:06:12 +0200 |
parents | 6c9305fbebaf |
children | 78e7fd16f472 |
rev | line source |
---|---|
2158 | 1 # basic operation |
2 adding a | |
2268
6c9305fbebaf
fix coding style of backout editor change.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
3 changeset 2:c86754337410 backs out changeset 1:a820f4f40a57 |
2158 | 4 a |
5 # file that was removed is recreated | |
6 adding a | |
7 adding a | |
2268
6c9305fbebaf
fix coding style of backout editor change.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
8 changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372 |
2158 | 9 content |
10 # backout of backout is as if nothing happened | |
11 removing a | |
2268
6c9305fbebaf
fix coding style of backout editor change.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
12 changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2 |
2158 | 13 cat: a: No such file or directory |
14 # backout with merge | |
15 adding a | |
2268
6c9305fbebaf
fix coding style of backout editor change.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
16 changeset 3:3c9e845b409c backs out changeset 1:314f55b1bf23 |
2158 | 17 merging with changeset 2:b66ea5b77abb |
18 merging a | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
19 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
|
20 (branch merge, don't forget to commit) |
2158 | 21 line 1 |