##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Moving hgweb.py into it's own module in preparation for breaking it up.
Moving hgweb.py into it's own module in preparation for breaking it up.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2303:78e7fd16 default
r2311:b832b6eb default
Show More
test-backout.out
21 lines | 617 B | text/plain | TextLexer
/ tests / test-backout.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
add backout command....
 r2158 # basic operation
adding a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
Vadim Gelfer
add backout command....
 r2158 a
# file that was removed is recreated
adding a
adding a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
Vadim Gelfer
add backout command....
 r2158 content
# backout of backout is as if nothing happened
removing a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
Vadim Gelfer
add backout command....
 r2158 cat: a: No such file or directory
# backout with merge
adding a
Thomas Arendsen Hein
Corrected tests for commit now consistently stripping last newline.
 r2303 changeset 3:6c77ecc28460 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