##// END OF EJS Templates
...
Merge with crew

File last commit:

r2268:6c9305fb default
r2298:4be9a79b merge default
Show More
test-backout.out
21 lines | 617 B | text/plain | TextLexer
Vadim Gelfer
add backout command....
r2158 # basic operation
adding a
Vadim Gelfer
fix coding style of backout editor change.
r2268 changeset 2:c86754337410 backs out changeset 1:a820f4f40a57
Vadim Gelfer
add backout command....
r2158 a
# file that was removed is recreated
adding a
adding a
Vadim Gelfer
fix coding style of backout editor change.
r2268 changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372
Vadim Gelfer
add backout command....
r2158 content
# backout of backout is as if nothing happened
removing a
Vadim Gelfer
fix coding style of backout editor change.
r2268 changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2
Vadim Gelfer
add backout command....
r2158 cat: a: No such file or directory
# backout with merge
adding a
Vadim Gelfer
fix coding style of backout editor change.
r2268 changeset 3:3c9e845b409c backs out changeset 1:314f55b1bf23
Vadim Gelfer
add backout command....
r2158 merging with changeset 2:b66ea5b77abb
merging a
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Vadim Gelfer
add backout command....
r2158 line 1