Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-backout.out @ 5377:756a43a30e34
convert: readd --filemap
To handle merges correctly, this revision adds a filemap_source class
that wraps a converter_source and does the work necessary to calculate
the subgraph we're interested in.
The wrapped converter_source must provide a new getchangedfiles method
that, given a revision rev, and an index N, returns the list of files
that are different in rev and its Nth parent.
The implementation depends on the ability to skip some revisions and to
change the parents field of the commit objects that we returned earlier.
To make the conversion restartable, we assume the revisons in the
revmapfile are topologically sorted.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Thu, 04 Oct 2007 23:21:37 -0300 |
| parents | f6e961c0155b |
| children |
line wrap: on
line source
# should complain abort: please specify a revision to backout abort: please specify just one revision # basic operation adding a reverting a changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57 a # file that was removed is recreated adding a adding a changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372 content # backout of backout is as if nothing happened removing a changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d cat: a: No such file or directory # backout with merge adding a reverting a changeset 3:3eb045e364a4 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 # backout should not back out subsequent changesets adding a adding b reverting a changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge) adding a adding b adding c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) # backout of merge should fail abort: cannot back out a merge changeset without --parent # backout of merge with bad parent should fail abort: cb9a9f314b8b is not a parent of b2f3bb92043e # backout of non-merge with parent should fail abort: cannot use --parent on non-merge changeset # backout with valid parent should be ok removing d changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e rolling back last transaction 1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing c changeset 5:033590168430 backs out changeset 4:b2f3bb92043e