Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-backout.out @ 2331:953dbfb2824c
diff: allow to use -rA:B syntax as well as -rA -rB
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 21 May 2006 23:07:19 -0700 |
parents | 78e7fd16f472 |
children | 8fe3d60b7f19 |
line wrap: on
line source
# basic operation adding a changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 a # file that was removed is recreated adding a adding a changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 content # backout of backout is as if nothing happened removing a changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a cat: a: No such file or directory # backout with merge adding a changeset 3:6c77ecc28460 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