Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-backout.out @ 2284:d6392a7c03dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
On win98 os.path.expanuser('~') does not result in a useable directory. The MSDN recommendation for user specific directories is the use of shell.ShGetSpecialFolder, so use it. For details see: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/functions/shgetspecialfolderpath.asp
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date Sun, 14 May 2006 23:44:50 -0700
parents 6c9305fbebaf
children 78e7fd16f472
line wrap: on
line source

# basic operation
adding a
changeset 2:c86754337410 backs out changeset 1:a820f4f40a57
a
# file that was removed is recreated
adding a
adding a
changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372
content
# backout of backout is as if nothing happened
removing a
changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2
cat: a: No such file or directory
# backout with merge
adding a
changeset 3:3c9e845b409c backs out changeset 1:314f55b1bf23
merging with changeset 2:b66ea5b77abb
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
line 1