Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-backout.out @ 2350:091d555653a4
contrib: patch review plugin for vim 7.0
The plugin takes an 'hg export'ed patch (in fact any
single or multi file patch) and opens multiple tabs
containing vim diff/merge windows for each affected
file in the patch allowing full visual code reviews.
author | Manpreet Singh <junkblocker@yahoo.com> |
---|---|
date | Sat, 27 May 2006 20:44:53 -0700 |
parents | 78e7fd16f472 |
children | 8fe3d60b7f19 |
rev | line source |
---|---|
2158 | 1 # basic operation |
2 adding a | |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
3 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 |
2158 | 4 a |
5 # file that was removed is recreated | |
6 adding a | |
7 adding a | |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
8 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 |
2158 | 9 content |
10 # backout of backout is as if nothing happened | |
11 removing a | |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
12 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a |
2158 | 13 cat: a: No such file or directory |
14 # backout with merge | |
15 adding a | |
2303
78e7fd16f472
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2268
diff
changeset
|
16 changeset 3:6c77ecc28460 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 |